diff options
-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, | |||
884 | return 0; | 884 | return 0; |
885 | } | 885 | } |
886 | } | 886 | } |
887 | if (id >= V4L2_CID_BASE | ||
888 | && id <= V4L2_CID_LASTP1) { | ||
889 | q_ctrl->flags |= V4L2_CTRL_FLAG_DISABLED; | ||
890 | return 0; | ||
891 | } | ||
892 | return -EINVAL; | 887 | return -EINVAL; |
893 | } | 888 | } |
894 | 889 | ||
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 @@ | |||
30 | 30 | ||
31 | #define MAX_GAMMA 0x10 /* 0 to 15 */ | 31 | #define MAX_GAMMA 0x10 /* 0 to 15 */ |
32 | 32 | ||
33 | #define V4L2_CID_EFFECTS (V4L2_CID_PRIVATE_BASE + 3) | 33 | #define V4L2_CID_EFFECTS (V4L2_CID_PRIVATE_BASE + 0) |
34 | 34 | ||
35 | MODULE_AUTHOR("Leandro Costantino <le_costantino@pixartargentina.com.ar>"); | 35 | MODULE_AUTHOR("Leandro Costantino <le_costantino@pixartargentina.com.ar>"); |
36 | MODULE_DESCRIPTION("GSPCA/T613 (JPEG Compliance) USB Camera Driver"); | 36 | MODULE_DESCRIPTION("GSPCA/T613 (JPEG Compliance) USB Camera Driver"); |