The following changes since commit ecd07f4b9d2173694be9214a3ab07f9efb5ba206: media: allegro: rename stream_id to dst_handle (2021-01-04 13:22:54 +0100) are available in the Git repository at: git://linuxtv.org/hverkuil/media_tree.git tags/br-v5.12a for you to fetch changes up to cba0332488a47cd7e42f9ae3b4011d45b4c21271: media: aspeed: fix error return code in aspeed_video_setup_video() (2021-01-07 10:57:45 +0100) ---------------------------------------------------------------- Tag branch ---------------------------------------------------------------- Arnd Bergmann (1): media: ti-vpe: cal: avoid FIELD_GET assertion Christophe JAILLET (1): media: vsp1: Fix an error handling path in the probe function Dan Carpenter (2): media: camss: Fix signedness bug in video_enum_fmt() media: camss: missing error code in msm_video_register() Dinghao Liu (3): media: em28xx: Fix use-after-free in em28xx_alloc_urbs media: media/pci: Fix memleak in empress_init media: tm6000: Fix memleak in tm6000_start_stream Enrico Weigelt (1): drivers: staging: media: remove unneeded MODULE_VERSION() call Ezequiel Garcia (3): media: imx: Unregister csc/scaler only if registered media: imx: Fix csc/scaler unregister media: imx: Clean capture unregister Geert Uytterhoeven (1): media: sh_vou: Drop bogus __refdata annotation Kieran Bingham (1): media: vsp1: Use BIT macro for feature identification Lukas Bulwahn (1): media: MAINTAINERS: correct entry in Amlogic GE2D driver section Martin Kepplinger (1): staging: media: imx: Kconfig: support VIDEO_IMX7_CSI for imx8m Matwey V. Kornilov (1): media: pwc: Use correct device for DMA Nigel Christian (1): media: cec: fix trivial style warnings Sebastian Fricke (1): media: rkisp1: isp: Add the enum_frame_size ioctl Travis Carter (2): staging:hantro: Fixed "replace comma with semicolon" Warning: staging:rkvdec: Fixed "replace comma with semicolon" Warning: Zhang Changzhong (2): media: mtk-vcodec: fix error return code in vdec_vp9_decode() media: aspeed: fix error return code in aspeed_video_setup_video() Zheng Yongjun (1): media: platform: davinci: Use DEFINE_SPINLOCK() for spinlock MAINTAINERS | 2 +- drivers/media/cec/core/cec-adap.c | 4 ++-- drivers/media/pci/saa7134/saa7134-empress.c | 5 ++++- drivers/media/platform/aspeed-video.c | 6 +++--- drivers/media/platform/davinci/vpif.c | 3 +-- drivers/media/platform/mtk-vcodec/vdec/vdec_vp9_if.c | 3 ++- drivers/media/platform/qcom/camss/camss-video.c | 3 ++- drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c | 34 ++++++++++++++++++++++++++++++++++ drivers/media/platform/sh_vou.c | 2 +- drivers/media/platform/ti-vpe/cal.h | 2 +- drivers/media/platform/vsp1/vsp1.h | 20 ++++++++++---------- drivers/media/platform/vsp1/vsp1_drv.c | 4 +++- drivers/media/usb/em28xx/em28xx-core.c | 6 +----- drivers/media/usb/pwc/pwc-if.c | 22 +++++++++++++--------- drivers/media/usb/tm6000/tm6000-dvb.c | 4 ++++ drivers/staging/media/hantro/hantro_v4l2.c | 2 +- drivers/staging/media/imx/Kconfig | 9 +++++---- drivers/staging/media/imx/Makefile | 2 +- drivers/staging/media/imx/imx-media-capture.c | 10 ++-------- drivers/staging/media/imx/imx-media-csc-scaler.c | 4 ---- drivers/staging/media/imx/imx-media-dev.c | 7 ++++++- drivers/staging/media/omap4iss/iss.c | 1 - drivers/staging/media/omap4iss/iss_video.h | 1 - drivers/staging/media/rkvdec/rkvdec.c | 2 +- 24 files changed, 98 insertions(+), 60 deletions(-)