Commit 5461e079 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'media/v6.2-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media 

Pull media fixes from Mauro Carvalho Chehab:

 - A regression at V4L2 core breaking string controls

 - Build warning fixes on sun6i drivers when building with clang

* tag 'media/v6.2-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:
  media: sun6i-isp: params: Unregister pending buffer on cleanup
  media: sun6i-isp: params: Fix incorrect indentation
  media: sun6i-isp: capture: Fix uninitialized variable use
  media: sun6i-isp: proc: Declare subdev ops as static
  media: sun6i-isp: proc: Error out on invalid port to fix warning
  media: sun6i-isp: proc: Fix return code handling in stream off path
  media: sun8i-a83t-mipi-csi2: Clarify return code handling in stream off path
  media: sun6i-mipi-csi2: Clarify return code handling in stream off path
  media: sun6i-csi: capture: Remove useless ret initialization
  media: sun6i-csi: bridge: Error out on invalid port to fix warning
  media: v4l2-ctrls-api.c: add back dropped ctrl->is_new = 1
parents 7a693ea7 542d3c03

drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_bridge.c

+1 −1
Original line number Diff line number Diff line
@@ -663,7 +663,7 @@ sun6i_csi_bridge_notifier_bound(struct v4l2_async_notifier *notifier, 
		enabled = !bridge->source_parallel.expected;

		break;

	default:

		break;

		return -EINVAL;

	}



	source->subdev = remote_subdev;

drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.c

+1 −1
Original line number Diff line number Diff line
@@ -832,7 +832,7 @@ static int sun6i_csi_capture_open(struct file *file) 
{

	struct sun6i_csi_device *csi_dev = video_drvdata(file);

	struct sun6i_csi_capture *capture = &csi_dev->capture;

	int ret = 0;

	int ret;



	if (mutex_lock_interruptible(&capture->lock))

		return -ERESTARTSYS;

drivers/media/platform/sunxi/sun6i-mipi-csi2/sun6i_mipi_csi2.c

+2 −3
Original line number Diff line number Diff line
@@ -188,7 +188,8 @@ static int sun6i_mipi_csi2_s_stream(struct v4l2_subdev *subdev, int on) 
		return -ENODEV;



	if (!on) {

		ret = v4l2_subdev_call(source_subdev, video, s_stream, 0);

		v4l2_subdev_call(source_subdev, video, s_stream, 0);

		ret = 0;

		goto disable;

	}
@@ -280,8 +281,6 @@ static int sun6i_mipi_csi2_s_stream(struct v4l2_subdev *subdev, int on) 
	return 0;



disable:

	if (!on)

		ret = 0;

	phy_power_off(dphy);

	sun6i_mipi_csi2_disable(csi2_dev);

drivers/media/platform/sunxi/sun8i-a83t-mipi-csi2/sun8i_a83t_mipi_csi2.c

+2 −3
Original line number Diff line number Diff line
@@ -220,7 +220,8 @@ static int sun8i_a83t_mipi_csi2_s_stream(struct v4l2_subdev *subdev, int on) 
		return -ENODEV;



	if (!on) {

		ret = v4l2_subdev_call(source_subdev, video, s_stream, 0);

		v4l2_subdev_call(source_subdev, video, s_stream, 0);

		ret = 0;

		goto disable;

	}
@@ -312,8 +313,6 @@ static int sun8i_a83t_mipi_csi2_s_stream(struct v4l2_subdev *subdev, int on) 
	return 0;



disable:

	if (!on)

		ret = 0;

	phy_power_off(dphy);

	sun8i_a83t_mipi_csi2_disable(csi2_dev);

drivers/media/v4l2-core/v4l2-ctrls-api.c

+1 −0
Original line number Diff line number Diff line
@@ -150,6 +150,7 @@ static int user_to_new(struct v4l2_ext_control *c, struct v4l2_ctrl *ctrl) 
			 * then return an error.

			 */

			if (strlen(ctrl->p_new.p_char) == ctrl->maximum && last)

			ctrl->is_new = 1;

				return -ERANGE;

		}

		return ret;