CHROMIUM: uvcvideo: Handle status_start while status_stop is in progress.

[cascardo/linux.git] / drivers / media / video / uvc / uvc_v4l2.c

diff --git a/drivers/media/video/uvc/uvc_v4l2.c b/drivers/media/video/uvc/uvc_v4l2.c
index 8db90ef..ff358cb 100644 (file)
--- a/drivers/media/video/uvc/uvc_v4l2.c
+++ b/drivers/media/video/uvc/uvc_v4l2.c
@@ -476,6 +476,7 @@ static int uvc_v4l2_open(struct file *file)
 {
        struct uvc_streaming *stream;
        struct uvc_fh *handle;
+       unsigned long timeout;
        int ret = 0;
 
        uvc_trace(UVC_TRACE_CALLS, "uvc_v4l2_open\n");
@@ -496,7 +497,14 @@ static int uvc_v4l2_open(struct file *file)
        }
 
        if (atomic_inc_return(&stream->dev->users) == 1) {
-               ret = uvc_status_start(stream->dev);
+               timeout = jiffies + msecs_to_jiffies(UVC_STATUS_START_TIMEOUT);
+               /* -EPERM means stop in progress, wait for completion */
+               do {
+                       ret = uvc_status_start(stream->dev);
+                       if (ret == -EPERM)
+                               usleep_range(5000, 6000);
+               } while (ret == -EPERM && time_before(jiffies, timeout));
+
                if (ret < 0) {
                        usb_autopm_put_interface(stream->dev->intf);
                        atomic_dec(&stream->dev->users);