diff options
| author | Jean-Francois Moine <moinejf@free.fr> | 2008-08-21 19:11:16 +0200 |
|---|---|---|
| committer | Jean-Francois Moine <moinejf@free.fr> | 2008-08-21 19:11:16 +0200 |
| commit | ff9634945387dde6b9a361d902bbe73d0c1a236e (patch) | |
| tree | cd3f3eb356f6de5fd6b525998a8c9fb1016157e6 /linux/drivers/media/video/gspca | |
| parent | b9ae7f8e368d1e376130025e9d903db00e39a414 (diff) | |
| download | mediapointer-dvb-s2-ff9634945387dde6b9a361d902bbe73d0c1a236e.tar.gz mediapointer-dvb-s2-ff9634945387dde6b9a361d902bbe73d0c1a236e.tar.bz2 | |
gspca: Have VIDIOC_QUERYCTRL more compliant to the spec.
From: Jean-Francois Moine <moinejf@free.fr>
- return -EINVAL when control not supported.
- start the private controls at V4L2_CID_PRIVATE_BASE.
Priority: normal
Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
Diffstat (limited to 'linux/drivers/media/video/gspca')
| -rw-r--r-- | linux/drivers/media/video/gspca/gspca.c | 5 | ||||
| -rw-r--r-- | linux/drivers/media/video/gspca/t613.c | 2 |
2 files changed, 1 insertions, 6 deletions
diff --git a/linux/drivers/media/video/gspca/gspca.c b/linux/drivers/media/video/gspca/gspca.c index fd008b956..731957af3 100644 --- a/linux/drivers/media/video/gspca/gspca.c +++ b/linux/drivers/media/video/gspca/gspca.c @@ -891,11 +891,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/linux/drivers/media/video/gspca/t613.c b/linux/drivers/media/video/gspca/t613.c index c90925362..27bff51a0 100644 --- a/linux/drivers/media/video/gspca/t613.c +++ b/linux/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"); |