Merge tag 'media/v5.17-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 12 Jan 2022 18:43:08 +0000 (10:43 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 12 Jan 2022 18:43:08 +0000 (10:43 -0800)
commit2ab9c9675fe892e7fe9fa8c0a6125e2b40d2889d
tree63c612009afaf5f4431374cf4b83648c43ae77e4
parent49008f0cc1ef0b86ccfa0d1d99e67741d46bd35b
parent8d4ff8187bb2b0c9025269f0da42ed16c878cb18
Merge tag 'media/v5.17-2' of git://git./linux/kernel/git/mchehab/linux-media

Pull media fixes from Mauro Carvalho Chehab:

 - some fixes at si2157 tuning logic

 - a warning fix on atomisp when used with clang

* tag 'media/v5.17-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:
  media: si2157: add support for DVB-C Annex C
  media: si2157: fix bandwidth stored in dev
  media: si2157: fix 6MHz & 6.1MHz bandwidth setting
  media: atomisp: Do not define input_system_cfg2400_t twice