diff options
| author | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2013-01-11 08:22:39 -0500 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2013-03-28 17:37:11 -0400 |
| commit | b41869711586b047c18435ba84baf334918bae01 (patch) | |
| tree | 36de334462c207e4140b25b2f26df72a036e710a | |
| parent | 1e2e9086c7a668489383a6cb7e7a8d7ac86bca36 (diff) | |
[media] uvcvideo: Return -EINVAL when setting a menu control to an invalid value
-ERANGE is the right error code when the value is outside of the menu
range, but -EINVAL must be reported for invalid values inside the range.
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
| -rw-r--r-- | drivers/media/usb/uvc/uvc_ctrl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/usb/uvc/uvc_ctrl.c b/drivers/media/usb/uvc/uvc_ctrl.c index 61e28dec991d..a2f4501c23ca 100644 --- a/drivers/media/usb/uvc/uvc_ctrl.c +++ b/drivers/media/usb/uvc/uvc_ctrl.c | |||
| @@ -1487,7 +1487,7 @@ int uvc_ctrl_set(struct uvc_video_chain *chain, | |||
| 1487 | step = mapping->get(mapping, UVC_GET_RES, | 1487 | step = mapping->get(mapping, UVC_GET_RES, |
| 1488 | uvc_ctrl_data(ctrl, UVC_CTRL_DATA_RES)); | 1488 | uvc_ctrl_data(ctrl, UVC_CTRL_DATA_RES)); |
| 1489 | if (!(step & value)) | 1489 | if (!(step & value)) |
| 1490 | return -ERANGE; | 1490 | return -EINVAL; |
| 1491 | } | 1491 | } |
| 1492 | 1492 | ||
| 1493 | break; | 1493 | break; |