media: uvcvideo: Accept invalid bFormatIndex and bFrameIndex values

[ Upstream commit dc9455ffae02d7b7fb51ba1e007fffcb9dc5d890 ]

The Renkforce RF AC4K 300 Action Cam 4K reports invalid bFormatIndex and
bFrameIndex values when negotiating the video probe and commit controls.
The UVC descriptors report a single supported format and frame size,
with bFormatIndex and bFrameIndex both equal to 2, but the video probe
and commit controls report bFormatIndex and bFrameIndex set to 1.

The device otherwise operates correctly, but the driver rejects the
values and fails the format try operation. Fix it by ignoring the
invalid indices, and assuming that the format and frame requested by the
driver are accepted by the device.

Link: https://bugzilla.kernel.org/show_bug.cgi?id=210767
Fixes: 8a652a17e3c0 ("media: uvcvideo: Ensure all probed info is returned to v4l2")
Reported-by: Till Dörges <doerges@pre-sense.de>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/media/usb/uvc/uvc_v4l2.c b/drivers/media/usb/uvc/uvc_v4l2.c
index 5156c971c241c9d1a183b6e2cc3bdf2e38e20e73..6a19cf94705b12ad2da6d2116661fb5f6a50375f 100644 (file)
--- a/drivers/media/usb/uvc/uvc_v4l2.c
+++ b/drivers/media/usb/uvc/uvc_v4l2.c
@@ -258,7 +258,9 @@ static int uvc_v4l2_try_format(struct uvc_streaming *stream,
                goto done;
 
        /* After the probe, update fmt with the values returned from
-        * negotiation with the device.
+        * negotiation with the device. Some devices return invalid bFormatIndex
+        * and bFrameIndex values, in which case we can only assume they have
+        * accepted the requested format as-is.
         */
        for (i = 0; i < stream->nformats; ++i) {
                if (probe->bFormatIndex == stream->format[i].index) {
@@ -267,11 +269,10 @@ static int uvc_v4l2_try_format(struct uvc_streaming *stream,
                }
        }
 
-       if (i == stream->nformats) {
-               uvc_trace(UVC_TRACE_FORMAT, "Unknown bFormatIndex %u\n",
+       if (i == stream->nformats)
+               uvc_trace(UVC_TRACE_FORMAT,
+                         "Unknown bFormatIndex %u, using default\n",
                          probe->bFormatIndex);
-               return -EINVAL;
-       }
 
        for (i = 0; i < format->nframes; ++i) {
                if (probe->bFrameIndex == format->frame[i].bFrameIndex) {
@@ -280,11 +281,10 @@ static int uvc_v4l2_try_format(struct uvc_streaming *stream,
                }
        }
 
-       if (i == format->nframes) {
-               uvc_trace(UVC_TRACE_FORMAT, "Unknown bFrameIndex %u\n",
+       if (i == format->nframes)
+               uvc_trace(UVC_TRACE_FORMAT,
+                         "Unknown bFrameIndex %u, using default\n",
                          probe->bFrameIndex);
-               return -EINVAL;
-       }
 
        fmt->fmt.pix.width = frame->wWidth;
        fmt->fmt.pix.height = frame->wHeight;