]> git.karo-electronics.de Git - linux-beck.git/commitdiff
[media] omap3isp: Move non-critical code out of the mutex-protected section
authorLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Mon, 19 May 2014 13:33:15 +0000 (10:33 -0300)
committerMauro Carvalho Chehab <m.chehab@samsung.com>
Thu, 21 Aug 2014 20:25:13 +0000 (15:25 -0500)
The isp_video_pix_to_mbus() and isp_video_mbus_to_pix() calls in
isp_video_set_format() only access static fields of the isp_video
structure. They don't need to be protected by a mutex.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Tested-by: Enrico Butera <ebutera@users.sourceforge.net>
Acked-by: Sakari Ailus <sakari.ailus@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
drivers/media/platform/omap3isp/ispvideo.c

index 04d45e70d3becf29868593c7bf3c89c72536df96..2876f34b84c0c0f37d87aac76e69d80f218e0785 100644 (file)
@@ -631,17 +631,16 @@ isp_video_set_format(struct file *file, void *fh, struct v4l2_format *format)
        if (format->type != video->type)
                return -EINVAL;
 
-       mutex_lock(&video->mutex);
-
        /* Fill the bytesperline and sizeimage fields by converting to media bus
         * format and back to pixel format.
         */
        isp_video_pix_to_mbus(&format->fmt.pix, &fmt);
        isp_video_mbus_to_pix(video, &fmt, &format->fmt.pix);
 
+       mutex_lock(&video->mutex);
        vfh->format = *format;
-
        mutex_unlock(&video->mutex);
+
        return 0;
 }