Commit 71c6c4c9 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

[media] v4l2-ctrls: v4l2_ctrl_handler_setup code simplification 



Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent e6402585

drivers/media/video/v4l2-ctrls.c

+4 −9
Original line number Diff line number Diff line
@@ -1411,26 +1411,21 @@ int v4l2_ctrl_handler_setup(struct v4l2_ctrl_handler *hdl) 
		int i;



		/* Skip if this control was already handled by a cluster. */

		if (ctrl->done)

		/* Skip button controls and read-only controls. */

		if (ctrl->done || ctrl->type == V4L2_CTRL_TYPE_BUTTON ||

		    (ctrl->flags & V4L2_CTRL_FLAG_READ_ONLY))

			continue;



		for (i = 0; i < master->ncontrols; i++) {

			if (master->cluster[i]) {

				cur_to_new(master->cluster[i]);

				master->cluster[i]->is_new = 1;

				master->cluster[i]->done = true;

			}

		}



		/* Skip button controls and read-only controls. */

		if (ctrl->type == V4L2_CTRL_TYPE_BUTTON ||

		    (ctrl->flags & V4L2_CTRL_FLAG_READ_ONLY))

			continue;

		ret = call_op(master, s_ctrl);

		if (ret)

			break;

		for (i = 0; i < master->ncontrols; i++)

			if (master->cluster[i])

				master->cluster[i]->done = true;

	}

	mutex_unlock(&hdl->lock);

	return ret;