Commit 8183e7a7 authored May 25, 2012 by Sylwester Nawrocki Committed by Mauro Carvalho Chehab Jun 25, 2012

[media] s5p-fimc: Update to the control handler lock changes

Commit 77e7c4e6
"v4l: Allow changing control handler lock" changed
the lock field of struct v4l2_ctrl_handler to a pointer
and this driver wasn't updated properly. This patch fixes
following warning:

drivers/media/video/s5p-fimc/fimc-core.c: In function ‘fimc_ctrls_activate’:
drivers/media/video/s5p-fimc/fimc-core.c:644: warning: passing argument 1 of ‘mutex_lock’ from incompatible pointer type
include/linux/mutex.h:152: note: expected ‘struct mutex *’ but argument is of type ‘struct mutex **’
drivers/media/video/s5p-fimc/fimc-core.c:663: warning: passing argument 1 of ‘mutex_unlock’ from incompatible pointer type
include/linux/mutex.h:169: note: expected ‘struct mutex *’ but argument is of type ‘struct mutex **’

Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

parent 0a198bcd

drivers/media/video/s5p-fimc/fimc-core.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -641,7 +641,7 @@ void fimc_ctrls_activate(struct fimc_ctx *ctx, bool active)
		if (!ctrls->ready)
		return;

		mutex_lock(&ctrls->handler.lock);
		mutex_lock(ctrls->handler.lock);
		v4l2_ctrl_activate(ctrls->rotate, active);
		v4l2_ctrl_activate(ctrls->hflip, active);
		v4l2_ctrl_activate(ctrls->vflip, active);
		@@ -660,7 +660,7 @@ void fimc_ctrls_activate(struct fimc_ctx *ctx, bool active)
		ctx->hflip = 0;
		ctx->vflip = 0;
		}
		mutex_unlock(&ctrls->handler.lock);
		mutex_unlock(ctrls->handler.lock);
		}

		/* Update maximum value of the alpha color control */

Admin message