---

yaml --- r: 130736 b: refs/heads/master c: 51cac8a h: refs/heads/master v: v3
git-mirror · Jan 29, 2009 · 2b39c54 · 2b39c54
1 parent 96b23aa
commit 2b39c54
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fba4578ee925110587ef9b8b6ddfabf2ce288071
+refs/heads/master: 51cac8ada5caaade4eca0023042ceb01edd82840
diff --git a/trunk/drivers/media/video/uvc/uvc_video.c b/trunk/drivers/media/video/uvc/uvc_video.c
@@ -114,7 +114,7 @@ static int uvc_get_video_ctrl(struct uvc_video_device *video,
 		ctrl->wCompQuality = le16_to_cpup((__le16 *)data);
 		ret = 0;
 		goto out;
-	} else if (query == GET_DEF && probe == 1) {
+	} else if (query == GET_DEF && probe == 1 && ret != size) {
 		/* Many cameras don't support the GET_DEF request on their
 		 * video probe control. Warn once and return, the caller will
 		 * fall back to GET_CUR.