Merge tag 'media/v5.15-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 27 Sep 2021 20:05:12 +0000 (13:05 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 27 Sep 2021 20:05:12 +0000 (13:05 -0700)
commite6609f2c07de03b948fd6c37c5eb4ade3a6d785c
treee9eb16a003ec5911dd1a2515fd122d4aef72ea44
parentc388a18957efdf31db8e97ec4d2d4b7dc1ca9a44
parentf0c15b360fb65ee39849afe987c16eb3d0175d0d
Merge tag 'media/v5.15-2' of git://git./linux/kernel/git/mchehab/linux-media

Pull media fixes from Mauro Carvalho Chehab:
 "A couple of driver fixes:

   - hantro: Fix check for single irq

   - cedrus: Fix SUNXI tile size calculation

   - s5p-jpeg: rename JPEG marker constants to prevent build warnings

   - ir_toy: prevent device from hanging during transmit"

* tag 'media/v5.15-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:
  media: ir_toy: prevent device from hanging during transmit
  media: s5p-jpeg: rename JPEG marker constants to prevent build warnings
  media: cedrus: Fix SUNXI tile size calculation
  media: hantro: Fix check for single irq