summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart@skynet.be>2009-01-04 00:08:26 +0100
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-01-29 11:35:37 +0100
commit51cac8ada5caaade4eca0023042ceb01edd82840 (patch)
tree5edbc37121ca2348499ca7f4c93025d95fe72246
parentV4L/DVB (10198): uvcvideo: Print the UVC version number in binary-coded decimal. (diff)
downloadlinux-51cac8ada5caaade4eca0023042ceb01edd82840.tar.xz
linux-51cac8ada5caaade4eca0023042ceb01edd82840.zip
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>
-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,
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.