Commit 6b463331 authored Jul 04, 2019 by Niklas Söderlund Committed by Mauro Carvalho Chehab Jul 25, 2019

media: rcar-vin: Always setup controls when opening video device

Now that both Gen2 (video device centric) and Gen3 (media device
centric) modes of the driver have controls it is required to always
setup the controls when opening the devices. Remove the check which only
calls v4l2_ctrl_handler_setup() for Gen2 and call it unconditionally.

Signed-off-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>

parent 1d99e68c

drivers/media/platform/rcar-vin/rcar-v4l2.c

+16 −16

Original line number	Diff line number	Diff line
		@@ -790,25 +790,25 @@ static int rvin_open(struct file *file)
		if (ret)
		goto err_unlock;

		if (vin->info->use_mc) {
		if (vin->info->use_mc)
		ret = v4l2_pipeline_pm_use(&vin->vdev.entity, 1);
		if (ret < 0)
		goto err_open;
		} else {
		if (v4l2_fh_is_singular_file(file)) {
		else if (v4l2_fh_is_singular_file(file))
		ret = rvin_power_parallel(vin, true);

		if (ret < 0)
		goto err_open;

		ret = v4l2_ctrl_handler_setup(&vin->ctrl_handler);
		if (ret)
		goto err_parallel;
		}
		}
		goto err_power;

		mutex_unlock(&vin->lock);

		return 0;
		err_parallel:
		err_power:
		if (vin->info->use_mc)
		v4l2_pipeline_pm_use(&vin->vdev.entity, 0);
		else if (v4l2_fh_is_singular_file(file))
		rvin_power_parallel(vin, false);
		err_open:
		v4l2_fh_release(file);