diff mbox series

[v3,3/8] media: uvcvideo: Return -EACCES for Wrong state error

Message ID 20220920-resend-v4l2-compliance-v3-3-598d33a15815@chromium.org
State Accepted
Commit 44cdba4130ecdb59ff94c617b6cd8dc22b4f3c97
Headers show
Series None | expand

Commit Message

Ricardo Ribalda Jan. 3, 2023, 2:36 p.m. UTC 
Error 2 is defined by UVC as:
 Wrong State: The device is in a state that disallows the specific
 request. The device will remain in this state until a specific action
 from the host or the user is completed.

This is documented as happening when attempting to set the value of a
manual control when the device is in auto mode. While V4L2 allows this,
the closest error code defined by VIDIOC_S_CTRL is indeed EACCES:
 EACCES: Attempt to set a read-only control or to get a write-only control.
 Or if there is an attempt to set an inactive control and the driver
 is not capable of caching the new value until the control is active
 again.

Replace EILSEQ with EACCES.

Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Suggested-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Ricardo Ribalda <ribalda@chromium.org>
---
 drivers/media/usb/uvc/uvc_video.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff mbox series

Patch

diff --git a/drivers/media/usb/uvc/uvc_video.c b/drivers/media/usb/uvc/uvc_video.c
index 6b20a23bc3cf..e56ccde9bd10 100644
--- a/drivers/media/usb/uvc/uvc_video.c
+++ b/drivers/media/usb/uvc/uvc_video.c
@@ -108,7 +108,7 @@  int uvc_query_ctrl(struct uvc_device *dev, u8 query, u8 unit,
 	case 1: /* Not ready */
 		return -EBUSY;
 	case 2: /* Wrong state */
-		return -EILSEQ;
+		return -EACCES;
 	case 3: /* Power */
 		return -EREMOTE;
 	case 4: /* Out of range */