summaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorAndoni Zubimendi2008-07-16 13:40:30 +0200
committerMauro Carvalho Chehab2008-07-20 12:27:01 +0200
commitb7474cf9f693a83c9a64c8504a08823a34994a2e (patch)
tree8b77fa1c2d84f5542124a7f6aabcfc48638014be /drivers/media
parentV4L/DVB (8360): gspca: Bad initialization of sn9c103 - ov7630. (diff)
downloadkernel-qcow2-linux-b7474cf9f693a83c9a64c8504a08823a34994a2e.tar.gz
kernel-qcow2-linux-b7474cf9f693a83c9a64c8504a08823a34994a2e.tar.xz
kernel-qcow2-linux-b7474cf9f693a83c9a64c8504a08823a34994a2e.zip
V4L/DVB (8361): gspca: Bad check of i2c write to sn9c10x.
Signed-off-by: Andoni Zubimendi <andoni.zubimendi@gmail.com> 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/sonixb.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/media/video/gspca/sonixb.c b/drivers/media/video/gspca/sonixb.c
index 054ce4e3ece7..80879bf3188f 100644
--- a/drivers/media/video/gspca/sonixb.c
+++ b/drivers/media/video/gspca/sonixb.c
@@ -456,8 +456,11 @@ static int i2c_w(struct gspca_dev *gspca_dev, const __u8 *buffer)
while (retry--) {
msleep(10);
reg_r(gspca_dev, 0x08);
- if (gspca_dev->usb_buf[0] == 4)
+ if (gspca_dev->usb_buf[0] & 0x04) {
+ if (gspca_dev->usb_buf[0] & 0x08)
+ return -1;
return 0;
+ }
}
return -1;
}