Skip to content

Commit

Permalink
V4L/DVB (8719): gspca: Have VIDIOC_QUERYCTRL more compliant to the spec.
Browse files Browse the repository at this point in the history
- 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>
  • Loading branch information
Jean-Francois Moine authored and Mauro Carvalho Chehab committed Sep 3, 2008
1 parent 6a70974 commit f9b4a37
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 6 deletions.
5 changes: 0 additions & 5 deletions drivers/media/video/gspca/gspca.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
2 changes: 1 addition & 1 deletion drivers/media/video/gspca/t613.c
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down

0 comments on commit f9b4a37

Please sign in to comment.