V4L/DVB (8719): gspca: Have VIDIOC_QUERYCTRL more compliant to the spec.

- return -EINVAL when control not supported.
- start the private controls at V4L2_CID_PRIVATE_BASE.

Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/video/gspca/gspca.c b/drivers/media/video/gspca/gspca.c
index 2f7bf263255c534850ab33aed419548196afec5e..061e1912924588d475be4f90b10cc25f0a6ad0b9 100644 (file)
--- a/drivers/media/video/gspca/gspca.c
+++ b/drivers/media/video/gspca/gspca.c
@@ -884,11 +884,6 @@ static int vidioc_queryctrl(struct file *file, void *priv,
                        return 0;
                }
        }
-       if (id >= V4L2_CID_BASE
-           && id <= V4L2_CID_LASTP1) {
-               q_ctrl->flags |= V4L2_CTRL_FLAG_DISABLED;
-               return 0;
-       }
        return -EINVAL;
 }
 

diff --git a/drivers/media/video/gspca/t613.c b/drivers/media/video/gspca/t613.c
index 357a2edad21e2487eaff54a961b9297a47ae3b44..962c1df5829731660497f743466424e88e1896ef 100644 (file)
--- a/drivers/media/video/gspca/t613.c
+++ b/drivers/media/video/gspca/t613.c
@@ -30,7 +30,7 @@
 
 #define MAX_GAMMA 0x10         /* 0 to 15 */
 
-#define V4L2_CID_EFFECTS (V4L2_CID_PRIVATE_BASE + 3)
+#define V4L2_CID_EFFECTS (V4L2_CID_PRIVATE_BASE + 0)
 
 MODULE_AUTHOR("Leandro Costantino <le_costantino@pixartargentina.com.ar>");
 MODULE_DESCRIPTION("GSPCA/T613 (JPEG Compliance) USB Camera Driver");