---

yaml --- r: 254637 b: refs/heads/master c: aa122d4 h: refs/heads/master i: 254635: 2492f9a v: v3
git-mirror · Jul 1, 2011 · e621166 · e621166
1 parent aa98d02
commit e621166
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8ca2c80b170c47eeb55f0c2a0f2b8edf85f35d49
+refs/heads/master: aa122d424b14b4a4c5ba302e668366717e9cac7b
diff --git a/trunk/drivers/media/video/uvc/uvc_video.c b/trunk/drivers/media/video/uvc/uvc_video.c
@@ -1255,8 +1255,10 @@ int uvc_video_enable(struct uvc_streaming *stream, int enable)
 
 	/* Commit the streaming parameters. */
 	ret = uvc_commit_video(stream, &stream->ctrl);
-	if (ret < 0)
+	if (ret < 0) {
+		uvc_queue_enable(&stream->queue, 0);
 		return ret;
+	}
 
 	return uvc_init_video(stream, GFP_KERNEL);
 }