aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video
diff options
context:
space:
mode:
authorSylwester Nawrocki <s.nawrocki@samsung.com>2012-04-21 18:46:30 -0300
committerBen Hutchings <ben@decadent.org.uk>2012-05-20 22:56:42 +0100
commitab13af236947f28b3245591f4c2c20085ec9e91e (patch)
treeec2ee661bf3754ec1e69186a6abc851d0683f7e3 /drivers/media/video
parent5a6cc206dfa8de733e848590b43d30706216733c (diff)
downloadkernel_samsung_smdk4412-ab13af236947f28b3245591f4c2c20085ec9e91e.zip
kernel_samsung_smdk4412-ab13af236947f28b3245591f4c2c20085ec9e91e.tar.gz
kernel_samsung_smdk4412-ab13af236947f28b3245591f4c2c20085ec9e91e.tar.bz2
s5p-fimc: Fix locking in subdev set_crop op
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: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'drivers/media/video')
-rw-r--r--drivers/media/video/s5p-fimc/fimc-capture.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/s5p-fimc/fimc-capture.c b/drivers/media/video/s5p-fimc/fimc-capture.c
index 2cc3b91..327a81f 100644
--- a/drivers/media/video/s5p-fimc/fimc-capture.c
+++ b/drivers/media/video/s5p-fimc/fimc-capture.c
@@ -1304,7 +1304,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;
}