Browse Source

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>
Rabin Vincent 17 years ago
parent
commit
fcf5cb2406
1 changed files with 1 additions and 1 deletions
  1. 1 1
      drivers/media/video/gspca/gspca.c

+ 1 - 1
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))