summaryrefslogtreecommitdiffstats
path: root/drivers/staging/media/omap4iss/iss_video.c
diff options
context:
space:
mode:
authorLaurent Pinchart2013-11-04 10:52:10 +0100
committerMauro Carvalho Chehab2013-12-03 20:55:32 +0100
commitc3dbc70d825968da10cf6fdde40447aeec632a2d (patch)
tree439c6b4cb7d731b20e16f45f6e04f6315269911d /drivers/staging/media/omap4iss/iss_video.c
parent[media] v4l: omap4iss: Translate -ENOIOCTLCMD to -ENOTTY (diff)
downloadkernel-qcow2-linux-c3dbc70d825968da10cf6fdde40447aeec632a2d.tar.gz
kernel-qcow2-linux-c3dbc70d825968da10cf6fdde40447aeec632a2d.tar.xz
kernel-qcow2-linux-c3dbc70d825968da10cf6fdde40447aeec632a2d.zip
[media] v4l: omap4iss: Move code out of mutex-protected section
The pad::get_fmt call must be protected by a mutex, but preparing its arguments doesn't need to be. Move the non-critical code out of the mutex-protected section. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Acked-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/staging/media/omap4iss/iss_video.c')
-rw-r--r--drivers/staging/media/omap4iss/iss_video.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/staging/media/omap4iss/iss_video.c b/drivers/staging/media/omap4iss/iss_video.c
index 63419b3769b5..68006231cc41 100644
--- a/drivers/staging/media/omap4iss/iss_video.c
+++ b/drivers/staging/media/omap4iss/iss_video.c
@@ -243,12 +243,11 @@ __iss_video_get_format(struct iss_video *video, struct v4l2_format *format)
if (subdev == NULL)
return -EINVAL;
- mutex_lock(&video->mutex);
-
fmt.pad = pad;
fmt.which = V4L2_SUBDEV_FORMAT_ACTIVE;
- ret = v4l2_subdev_call(subdev, pad, get_fmt, NULL, &fmt);
+ mutex_lock(&video->mutex);
+ ret = v4l2_subdev_call(subdev, pad, get_fmt, NULL, &fmt);
mutex_unlock(&video->mutex);
if (ret)