[PATCH 08/10] media: uvcvideo: Always return a value on V4L2_CTRL_WHICH_DEF_VAL

[Ricardo Ribalda]

Fixes v4l2-compliance:
Control ioctls (Input 0):
                fail: v4l2-test-controls.cpp(813): doioctl(node, 
VIDIOC_G_EXT_CTRLS, &ctrls)
        test VIDIOC_G/S/TRY_EXT_CTRLS: FAIL

Signed-off-by: Ricardo Ribalda <riba...@chromium.org>
---
 drivers/media/usb/uvc/uvc_v4l2.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/drivers/media/usb/uvc/uvc_v4l2.c b/drivers/media/usb/uvc/uvc_v4l2.c
index 9b6454bb2f28..b500356fd06c 100644
--- a/drivers/media/usb/uvc/uvc_v4l2.c
+++ b/drivers/media/usb/uvc/uvc_v4l2.c
@@ -1057,12 +1057,7 @@ static int uvc_ioctl_g_ext_ctrls(struct file *file, void 
*fh,
                        struct v4l2_queryctrl qc = { .id = ctrl->id };
 
                        ret = uvc_query_v4l2_ctrl(chain, &qc);
-                       if (ret < 0) {
-                               ctrls->error_idx = i;
-                               return ret;
-                       }
-
-                       ctrl->value = qc.default_value;
+                       ctrl->value = (ret < 0) ? 0 : qc.default_value;
                }
 
                return 0;
-- 
2.31.0.rc2.261.g7f71774620-goog