diff options
| author | Jean-Francois Moine | 2008-09-03 21:48:14 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab | 2008-09-03 23:36:59 +0200 |
| commit | f9b4a377dc6601a3299171c7b24c2c5189c0c10b (patch) | |
| tree | efc3414238f8faab6f33a91bd19ec3462882bb5a /drivers/media/video | |
| parent | V4L/DVB (8718): gspca: suspend/resume added. (diff) | |
| download | kernel-qcow2-linux-f9b4a377dc6601a3299171c7b24c2c5189c0c10b.tar.gz kernel-qcow2-linux-f9b4a377dc6601a3299171c7b24c2c5189c0c10b.tar.xz kernel-qcow2-linux-f9b4a377dc6601a3299171c7b24c2c5189c0c10b.zip | |
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>
Diffstat (limited to 'drivers/media/video')
| -rw-r--r-- | drivers/media/video/gspca/gspca.c | 5 | ||||
| -rw-r--r-- | drivers/media/video/gspca/t613.c | 2 |
2 files changed, 1 insertions, 6 deletions
diff --git a/drivers/media/video/gspca/gspca.c b/drivers/media/video/gspca/gspca.c index 2f7bf263255c..061e19129245 100644 --- 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 357a2edad21e..962c1df58297 100644 --- 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"); |