From ffbb603e997acceb52a55d92dc268ce1f0efdd2d Mon Sep 17 00:00:00 2001
From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Date: Tue, 25 Oct 2011 09:03:42 -0300
Subject: [PATCH] --- yaml --- r: 285366 b: refs/heads/master c:
 24c3aae0c740ae9837284266ea82234415721dc1 h: refs/heads/master v: v3

---
 [refs]                                    | 2 +-
 trunk/drivers/media/video/uvc/uvc_video.c | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 08e3b7218a5d..1281f0b119ef 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6998b6fb4b1c8f320adeee938d399c4d8dcc90e2
+refs/heads/master: 24c3aae0c740ae9837284266ea82234415721dc1
diff --git a/trunk/drivers/media/video/uvc/uvc_video.c b/trunk/drivers/media/video/uvc/uvc_video.c
index 2995f26ccae9..2e5e72825ad1 100644
--- a/trunk/drivers/media/video/uvc/uvc_video.c
+++ b/trunk/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;
+}