1 files changed, 7 insertions, 2 deletions

diff --git a/drivers/media/video/uvc/uvc_video.c b/drivers/media/video/uvc/uvc_video.c
index 2995f26ccae..2e5e72825ad 100644
--- a/drivers/media/video/uvc/uvc_video.c
+++ b/drivers/media/video/uvc/uvc_video.c
@@ -1283,6 +1283,11 @@ int uvc_video_enable(struct uvc_streaming *stream, int enable)
                 return ret;
         }
 
-        return uvc_init_video(stream, GFP_KERNEL);
-}
+        ret = uvc_init_video(stream, GFP_KERNEL);
+        if (ret < 0) {
+                usb_set_interface(stream->dev->udev, stream->intfnum, 0);
+                uvc_queue_enable(&stream->queue, 0);
+        }
 
+        return ret;
+}