]> git.karo-electronics.de Git - linux-beck.git/commitdiff
[media] s5p-fimc: Fix locking in subdev set_crop op
authorSylwester Nawrocki <s.nawrocki@samsung.com>
Sat, 21 Apr 2012 21:46:30 +0000 (18:46 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Mon, 14 May 2012 13:20:21 +0000 (10:20 -0300)
When setting TRY crop on the sub-device the mutex was erroneously acquired
rather than released on exit path. This bug is present in kernels starting
from v3.2.

Cc: stable@vger.kernel.org
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>
drivers/media/video/s5p-fimc/fimc-capture.c

index 72d51504ed217ced3de249e7785f9f5cfa75f19d..520217758c04cd6fe9ed3b94a8e60e0363f138cb 100644 (file)
@@ -1385,7 +1385,7 @@ static int fimc_subdev_set_crop(struct v4l2_subdev *sd,
        fimc_capture_try_crop(ctx, r, crop->pad);
 
        if (crop->which == V4L2_SUBDEV_FORMAT_TRY) {
-               mutex_lock(&fimc->lock);
+               mutex_unlock(&fimc->lock);
                *v4l2_subdev_get_try_crop(fh, crop->pad) = *r;
                return 0;
        }