From 384a0618ca8b5d5e92bee9f3218558615332193d Mon Sep 17 00:00:00 2001 From: Andoni Zubimendi Date: Wed, 16 Jul 2008 08:40:30 -0300 Subject: [PATCH] --- yaml --- r: 104031 b: refs/heads/master c: b7474cf9f693a83c9a64c8504a08823a34994a2e h: refs/heads/master i: 104029: e73ccece9c5add447697d184db9163bc5a19c233 104027: b9ca84465480243e9bf19e19131862c8f667a074 104023: 86018a005abbcc9b10186db538717873e0248d77 104015: 49839a9791eea5999ee44dae10691942aa356214 103999: 5f213cce153c9d173b21926be15947320ec96ec8 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/gspca/sonixb.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 62d7e145c74a..3212bb5e893e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 794af52a4ce5279c52f1467448b9e672a7db37f0 +refs/heads/master: b7474cf9f693a83c9a64c8504a08823a34994a2e diff --git a/trunk/drivers/media/video/gspca/sonixb.c b/trunk/drivers/media/video/gspca/sonixb.c index 054ce4e3ece7..80879bf3188f 100644 --- a/trunk/drivers/media/video/gspca/sonixb.c +++ b/trunk/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; }