V4L/DVB (8318): OV7670: don't reject unsupported settings

For VIDIOC_G_FMT/VIDIOC_TRY_FMT, the V4L2 API spec states:
"Drivers should not return an error code unless the input is ambiguous"
"Very simple, inflexible devices may even ignore all input and always
return the default parameters."
"When the requested buffer type is not supported drivers return an
EINVAL error code."
i.e. returning errors for unsupported fields is bad, and it's ok to
unconditionally overwrite user-requested settings

This patch makes ov7670 meet that behaviour, and brings it in line with
other drivers e.g. stk-webcam. It also fixes compatibility with (unpatched)
gstreamer.

Signed-off-by: Daniel Drake <dsd@laptop.org>
Acked-by: Jonathan Corbet <corbet@lwn.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

1 files changed, 6 insertions, 6 deletions

diff --git a/drivers/media/video/ov7670.c b/drivers/media/video/ov7670.c
index d7bfd30f74a9..5e0d4e2ee510 100644
--- a/drivers/media/video/ov7670.c
+++ b/drivers/media/video/ov7670.c
@@ -682,17 +682,17 @@ static int ov7670_try_fmt(struct i2c_client *c, struct v4l2_format *fmt,
         for (index = 0; index < N_OV7670_FMTS; index++)
                 if (ov7670_formats[index].pixelformat == pix->pixelformat)
                         break;
-        if (index >= N_OV7670_FMTS)
-                return -EINVAL;
+        if (index >= N_OV7670_FMTS) {
+                /* default to first format */
+                index = 0;
+                pix->pixelformat = ov7670_formats[0].pixelformat;
+        }
         if (ret_fmt != NULL)
                 *ret_fmt = ov7670_formats + index;
         /*
          * Fields: the OV devices claim to be progressive.
          */
-        if (pix->field == V4L2_FIELD_ANY)
-                pix->field = V4L2_FIELD_NONE;
-        else if (pix->field != V4L2_FIELD_NONE)
-                return -EINVAL;
+        pix->field = V4L2_FIELD_NONE;
         /*
          * Round requested image size down to the nearest
          * we support, but not below the smallest.