aboutsummaryrefslogtreecommitdiff
path: root/drivers/media
diff options
context:
space:
mode:
authorRabin Vincent <rabin@rab.in>2008-08-03 07:58:54 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-08-06 06:57:27 -0300
commitfcf5cb2406827fc9d3f3fe260ac883ef72b8bac0 (patch)
treeb21fcfb5b0a977498388ab12809cf8c53ad1b6b7 /drivers/media
parentcebf3b67f7f80fd69bd1ff5787fee69ab8fd3c2a (diff)
V4L/DVB (8605): gspca: Fix of gspca_zc3xx oops - 2.6.27-rc1
Bad mini/max check in setting control values (the gamma in zc3xx could be set to null). Signed-off-by: Rabin Vincent <rabin@rab.in> Signed-off-by: Jean-Francois Moine <moinejf@free.fr> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/video/gspca/gspca.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/gspca/gspca.c b/drivers/media/video/gspca/gspca.c
index 7f773e37897..15d302b28b7 100644
--- a/drivers/media/video/gspca/gspca.c
+++ b/drivers/media/video/gspca/gspca.c
@@ -904,7 +904,7 @@ static int vidioc_s_ctrl(struct file *file, void *priv,
if (ctrl->id != ctrls->qctrl.id)
continue;
if (ctrl->value < ctrls->qctrl.minimum
- && ctrl->value > ctrls->qctrl.maximum)
+ || ctrl->value > ctrls->qctrl.maximum)
return -ERANGE;
PDEBUG(D_CONF, "set ctrl [%08x] = %d", ctrl->id, ctrl->value);
if (mutex_lock_interruptible(&gspca_dev->usb_lock))