aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart@skynet.be>2009-01-03 18:08:26 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-01-29 05:35:37 -0500
commit51cac8ada5caaade4eca0023042ceb01edd82840 (patch)
tree5edbc37121ca2348499ca7f4c93025d95fe72246 /drivers/media
parentfba4578ee925110587ef9b8b6ddfabf2ce288071 (diff)
V4L/DVB (10199): uvcvideo: Fix GET_DEF failure detection.
Commit 44f0079ec74330b457d990072c13cbe28b0f1abf erroneously considers all GET_DEF requests as unsuccessful. Fix this by checking the request return value. Signed-off-by: Laurent Pinchart <laurent.pinchart@skynet.be> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/video/uvc/uvc_video.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/uvc/uvc_video.c b/drivers/media/video/uvc/uvc_video.c
index f9eb0e974051..9bc4705be78d 100644
--- a/drivers/media/video/uvc/uvc_video.c
+++ b/drivers/media/video/uvc/uvc_video.c
@@ -114,7 +114,7 @@ static int uvc_get_video_ctrl(struct uvc_video_device *video,
114 ctrl->wCompQuality = le16_to_cpup((__le16 *)data); 114 ctrl->wCompQuality = le16_to_cpup((__le16 *)data);
115 ret = 0; 115 ret = 0;
116 goto out; 116 goto out;
117 } else if (query == GET_DEF && probe == 1) { 117 } else if (query == GET_DEF && probe == 1 && ret != size) {
118 /* Many cameras don't support the GET_DEF request on their 118 /* Many cameras don't support the GET_DEF request on their
119 * video probe control. Warn once and return, the caller will 119 * video probe control. Warn once and return, the caller will
120 * fall back to GET_CUR. 120 * fall back to GET_CUR.