]> git.karo-electronics.de Git - karo-tx-linux.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)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 21 May 2012 17:46:18 +0000 (10:46 -0700)
commit e985dbf7d93e2a3e114b4525413e50f83613e0cb upstream.

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.

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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/media/video/s5p-fimc/fimc-capture.c

index a9e9653beeb4581a90ea34eed1b3d96eab2aae5d..8dab7fd81fd51d2c355ed79836d1d3df3add856d 100644 (file)
@@ -1316,7 +1316,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;
        }