summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/gspca
diff options
context:
space:
mode:
authorJean-Francois Moine <moinejf@free.fr>2008-08-03 12:58:54 +0200
committerJean-Francois Moine <moinejf@free.fr>2008-08-03 12:58:54 +0200
commitfbc9468c72cac92d4b792aba7721520a92230677 (patch)
treea720b72c9d23ae48ff9b558d6600678ead2f1bff /linux/drivers/media/video/gspca
parent48e03e6db17a7d53bd10cb2c9e75d7d49b364e14 (diff)
downloadmediapointer-dvb-s2-fbc9468c72cac92d4b792aba7721520a92230677.tar.gz
mediapointer-dvb-s2-fbc9468c72cac92d4b792aba7721520a92230677.tar.bz2
gspca: Fix of gspca_zc3xx oops - 2.6.27-rc1
From: Rabin Vincent <rabin@rab.in> 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>
Diffstat (limited to 'linux/drivers/media/video/gspca')
-rw-r--r--linux/drivers/media/video/gspca/gspca.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/linux/drivers/media/video/gspca/gspca.c b/linux/drivers/media/video/gspca/gspca.c
index 600112ede..61071a4f4 100644
--- a/linux/drivers/media/video/gspca/gspca.c
+++ b/linux/drivers/media/video/gspca/gspca.c
@@ -911,7 +911,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))