diff options
Diffstat (limited to 'drivers/media/platform/omap3isp/ispvideo.c')
-rw-r--r-- | drivers/media/platform/omap3isp/ispvideo.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/media/platform/omap3isp/ispvideo.c b/drivers/media/platform/omap3isp/ispvideo.c index a908d006f527..f6304bb074f5 100644 --- a/drivers/media/platform/omap3isp/ispvideo.c +++ b/drivers/media/platform/omap3isp/ispvideo.c | |||
@@ -339,14 +339,11 @@ __isp_video_get_format(struct isp_video *video, struct v4l2_format *format) | |||
339 | if (subdev == NULL) | 339 | if (subdev == NULL) |
340 | return -EINVAL; | 340 | return -EINVAL; |
341 | 341 | ||
342 | mutex_lock(&video->mutex); | ||
343 | |||
344 | fmt.pad = pad; | 342 | fmt.pad = pad; |
345 | fmt.which = V4L2_SUBDEV_FORMAT_ACTIVE; | 343 | fmt.which = V4L2_SUBDEV_FORMAT_ACTIVE; |
346 | ret = v4l2_subdev_call(subdev, pad, get_fmt, NULL, &fmt); | ||
347 | if (ret == -ENOIOCTLCMD) | ||
348 | ret = -EINVAL; | ||
349 | 344 | ||
345 | mutex_lock(&video->mutex); | ||
346 | ret = v4l2_subdev_call(subdev, pad, get_fmt, NULL, &fmt); | ||
350 | mutex_unlock(&video->mutex); | 347 | mutex_unlock(&video->mutex); |
351 | 348 | ||
352 | if (ret) | 349 | if (ret) |