From: Mauro Carvalho Chehab <mchehab@kernel.org>
Date: Tue, 15 Nov 2022 12:11:46 +0000 (+0000)
Subject: Merge tag 'br-v6.2d' of git://linuxtv.org/hverkuil/media_tree into media_stage
X-Git-Tag: io_uring-6.2-2022-12-19~37^2~248
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=b9fbe29c59065c24df9e9fb3153db36403d45e2d;p=linux-block.git

Merge tag 'br-v6.2d' of git://linuxtv.org/hverkuil/media_tree into media_stage

Tag branch

* tag 'br-v6.2d' of git://linuxtv.org/hverkuil/media_tree: (35 commits)
  media: saa7164: remove variable cnt
  atomisp: fix potential NULL pointer dereferences
  radio-terratec: Remove variable p
  media: platform: s5p-mfc: Fix spelling mistake "mmaping" -> "mmapping"
  media: platform: mtk-mdp3: remove unused VIDEO_MEDIATEK_VPU config
  media: vivid: remove redundant assignment to variable checksum
  media: cedrus: h264: Optimize mv col buffer allocation
  media: cedrus: h265: Associate mv col buffers with buffer
  media: mediatek: vcodec: fix h264 cavlc bitstream fail
  media: cedrus: hevc: Fix offset adjustments
  media: imx-jpeg: Fix Coverity issue in probe
  media: v4l2-ioctl.c: Unify YCbCr/YUV terms in format descriptions
  media: atomisp: Fix spelling mistake "mis-match" -> "mismatch"
  media: c8sectpfe: Add missed header(s)
  media: adv748x: afe: Select input port when initializing AFE
  media: vimc: Update device configuration in the documentation
  media: adv748x: Remove dead function declaration
  media: mxl5005s: Make array RegAddr static const
  media: atomisp: Fix spelling mistake "modee" -> "mode"
  media: meson/vdec: always init coef_node_start
  ...
---

b9fbe29c59065c24df9e9fb3153db36403d45e2d
diff --cc drivers/staging/media/sunxi/cedrus/cedrus_h264.c
index c139a37a567c,c92dec21c1ac..dfb401df138a
--- a/drivers/staging/media/sunxi/cedrus/cedrus_h264.c
+++ b/drivers/staging/media/sunxi/cedrus/cedrus_h264.c
@@@ -496,8 -516,9 +516,9 @@@ static void cedrus_h264_irq_disable(str
  static int cedrus_h264_setup(struct cedrus_ctx *ctx, struct cedrus_run *run)
  {
  	struct cedrus_dev *dev = ctx->dev;
+ 	int ret;
  
 -	cedrus_engine_enable(ctx, CEDRUS_CODEC_H264);
 +	cedrus_engine_enable(ctx);
  
  	cedrus_write(dev, VE_H264_SDROT_CTRL, 0);
  	cedrus_write(dev, VE_H264_EXTRA_BUFFER1,