Merge tag 'media/v4.2-3' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
Pull media fixes from Mauro Carvalho Chehab: - a regression fix at the videobuf2 core driver - fix error handling at mantis probing code - revert the IR encode patches, as the API is not mature enough. So, better to postpone the changes to a latter Kernel - fix Kconfig breakages on some randconfig scenarios. * tag 'media/v4.2-3' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: [media] mantis: Fix error handling in mantis_dma_init() Revert "[media] rc: rc-ir-raw: Add scancode encoder callback" Revert "[media] rc: rc-ir-raw: Add Manchester encoder (phase encoder) helper" Revert "[media] rc: ir-rc5-decoder: Add encode capability" Revert "[media] rc: ir-rc6-decoder: Add encode capability" Revert "[media] rc: rc-core: Add support for encode_wakeup drivers" Revert "[media] rc: rc-loopback: Add loopback of filter scancodes" Revert "[media] rc: nuvoton-cir: Add support for writing wakeup samples via sysfs filter callback" [media] vb2: Fix compilation breakage when !CONFIG_BUG [media] vb2: Only requeue buffers immediately once streaming is started [media] media/pci/cobalt: fix Kconfig and build when SND is not enabled [media] media/dvb: fix ts2020.c Kconfig and build
Showing
- drivers/media/dvb-frontends/Kconfig 1 addition, 1 deletiondrivers/media/dvb-frontends/Kconfig
- drivers/media/pci/cobalt/Kconfig 1 addition, 0 deletionsdrivers/media/pci/cobalt/Kconfig
- drivers/media/pci/cobalt/cobalt-irq.c 1 addition, 1 deletiondrivers/media/pci/cobalt/cobalt-irq.c
- drivers/media/pci/mantis/mantis_dma.c 3 additions, 2 deletionsdrivers/media/pci/mantis/mantis_dma.c
- drivers/media/rc/ir-rc5-decoder.c 0 additions, 116 deletionsdrivers/media/rc/ir-rc5-decoder.c
- drivers/media/rc/ir-rc6-decoder.c 0 additions, 122 deletionsdrivers/media/rc/ir-rc6-decoder.c
- drivers/media/rc/nuvoton-cir.c 0 additions, 127 deletionsdrivers/media/rc/nuvoton-cir.c
- drivers/media/rc/nuvoton-cir.h 0 additions, 1 deletiondrivers/media/rc/nuvoton-cir.h
- drivers/media/rc/rc-core-priv.h 0 additions, 36 deletionsdrivers/media/rc/rc-core-priv.h
- drivers/media/rc/rc-ir-raw.c 0 additions, 139 deletionsdrivers/media/rc/rc-ir-raw.c
- drivers/media/rc/rc-loopback.c 0 additions, 36 deletionsdrivers/media/rc/rc-loopback.c
- drivers/media/rc/rc-main.c 1 addition, 6 deletionsdrivers/media/rc/rc-main.c
- drivers/media/v4l2-core/videobuf2-core.c 25 additions, 15 deletionsdrivers/media/v4l2-core/videobuf2-core.c
- include/media/rc-core.h 0 additions, 7 deletionsinclude/media/rc-core.h
- include/media/videobuf2-core.h 2 additions, 0 deletionsinclude/media/videobuf2-core.h
Please register or sign in to comment