1 files changed, 171 insertions, 152 deletions

diff --git a/drivers/media/video/gspca/sn9c20x.c b/drivers/media/video/gspca/sn9c20x.c
index 45092eed8fc..15c371e4f8d 100644
--- a/drivers/media/video/gspca/sn9c20x.c
+++ b/drivers/media/video/gspca/sn9c20x.c
@@ -1061,10 +1061,13 @@ static struct i2c_reg_u8 hv7131r_init[] = {
         {0x23, 0x09}, {0x01, 0x08},
 };
 
-static int reg_r(struct gspca_dev *gspca_dev, u16 reg, u16 length)
+static void reg_r(struct gspca_dev *gspca_dev, u16 reg, u16 length)
 {
         struct usb_device *dev = gspca_dev->dev;
         int result;
+
+        if (gspca_dev->usb_err < 0)
+                return;
         result = usb_control_msg(dev, usb_rcvctrlpipe(dev, 0),
                         0x00,
                         USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_INTERFACE,
@@ -1074,17 +1077,19 @@ static int reg_r(struct gspca_dev *gspca_dev, u16 reg, u16 length)
                         length,
                         500);
         if (unlikely(result < 0 || result != length)) {
-                pr_err("Read register failed 0x%02X\n", reg);
-                return -EIO;
+                pr_err("Read register %02x failed %d\n", reg, result);
+                gspca_dev->usb_err = result;
         }
-        return 0;
 }
 
-static int reg_w(struct gspca_dev *gspca_dev, u16 reg,
+static void reg_w(struct gspca_dev *gspca_dev, u16 reg,
                  const u8 *buffer, int length)
 {
         struct usb_device *dev = gspca_dev->dev;
         int result;
+
+        if (gspca_dev->usb_err < 0)
+                return;
         memcpy(gspca_dev->usb_buf, buffer, length);
         result = usb_control_msg(dev, usb_sndctrlpipe(dev, 0),
                         0x08,
@@ -1095,35 +1100,39 @@ static int reg_w(struct gspca_dev *gspca_dev, u16 reg,
                         length,
                         500);
         if (unlikely(result < 0 || result != length)) {
-                pr_err("Write register failed index 0x%02X\n", reg);
-                return -EIO;
+                pr_err("Write register %02x failed %d\n", reg, result);
+                gspca_dev->usb_err = result;
         }
-        return 0;
 }
 
-static int reg_w1(struct gspca_dev *gspca_dev, u16 reg, const u8 value)
+static void reg_w1(struct gspca_dev *gspca_dev, u16 reg, const u8 value)
 {
         u8 data[1] = {value};
-        return reg_w(gspca_dev, reg, data, 1);
+        reg_w(gspca_dev, reg, data, 1);
 }
 
-static int i2c_w(struct gspca_dev *gspca_dev, const u8 *buffer)
+static void i2c_w(struct gspca_dev *gspca_dev, const u8 *buffer)
 {
         int i;
         reg_w(gspca_dev, 0x10c0, buffer, 8);
         for (i = 0; i < 5; i++) {
                 reg_r(gspca_dev, 0x10c0, 1);
+                if (gspca_dev->usb_err < 0)
+                        return;
                 if (gspca_dev->usb_buf[0] & 0x04) {
-                        if (gspca_dev->usb_buf[0] & 0x08)
-                                return -EIO;
-                        return 0;
+                        if (gspca_dev->usb_buf[0] & 0x08) {
+                                pr_err("i2c_w error\n");
+                                gspca_dev->usb_err = -EIO;
+                        }
+                        return;
                 }
                 msleep(1);
         }
-        return -EIO;
+        pr_err("i2c_w reg %02x no response\n", buffer[2]);
+/*      gspca_dev->usb_err = -EIO;      fixme: may occur */
 }
 
-static int i2c_w1(struct gspca_dev *gspca_dev, u8 reg, u8 val)
+static void i2c_w1(struct gspca_dev *gspca_dev, u8 reg, u8 val)
 {
         struct sd *sd = (struct sd *) gspca_dev;
 
@@ -1142,10 +1151,10 @@ static int i2c_w1(struct gspca_dev *gspca_dev, u8 reg, u8 val)
         row[6] = 0x00;
         row[7] = 0x10;
 
-        return i2c_w(gspca_dev, row);
+        i2c_w(gspca_dev, row);
 }
 
-static int i2c_w2(struct gspca_dev *gspca_dev, u8 reg, u16 val)
+static void i2c_w2(struct gspca_dev *gspca_dev, u8 reg, u16 val)
 {
         struct sd *sd = (struct sd *) gspca_dev;
         u8 row[8];
@@ -1163,10 +1172,10 @@ static int i2c_w2(struct gspca_dev *gspca_dev, u8 reg, u16 val)
         row[6] = 0x00;
         row[7] = 0x10;
 
-        return i2c_w(gspca_dev, row);
+        i2c_w(gspca_dev, row);
 }
 
-static int i2c_r1(struct gspca_dev *gspca_dev, u8 reg, u8 *val)
+static void i2c_r1(struct gspca_dev *gspca_dev, u8 reg, u8 *val)
 {
         struct sd *sd = (struct sd *) gspca_dev;
         u8 row[8];
@@ -1179,19 +1188,15 @@ static int i2c_r1(struct gspca_dev *gspca_dev, u8 reg, u8 *val)
         row[5] = 0;
         row[6] = 0;
         row[7] = 0x10;
-        if (i2c_w(gspca_dev, row) < 0)
-                return -EIO;
+        i2c_w(gspca_dev, row);
         row[0] = 0x81 | (1 << 4) | 0x02;
         row[2] = 0;
-        if (i2c_w(gspca_dev, row) < 0)
-                return -EIO;
-        if (reg_r(gspca_dev, 0x10c2, 5) < 0)
-                return -EIO;
+        i2c_w(gspca_dev, row);
+        reg_r(gspca_dev, 0x10c2, 5);
         *val = gspca_dev->usb_buf[4];
-        return 0;
 }
 
-static int i2c_r2(struct gspca_dev *gspca_dev, u8 reg, u16 *val)
+static void i2c_r2(struct gspca_dev *gspca_dev, u8 reg, u16 *val)
 {
         struct sd *sd = (struct sd *) gspca_dev;
         u8 row[8];
@@ -1204,73 +1209,72 @@ static int i2c_r2(struct gspca_dev *gspca_dev, u8 reg, u16 *val)
         row[5] = 0;
         row[6] = 0;
         row[7] = 0x10;
-        if (i2c_w(gspca_dev, row) < 0)
-                return -EIO;
+        i2c_w(gspca_dev, row);
         row[0] = 0x81 | (2 << 4) | 0x02;
         row[2] = 0;
-        if (i2c_w(gspca_dev, row) < 0)
-                return -EIO;
-        if (reg_r(gspca_dev, 0x10c2, 5) < 0)
-                return -EIO;
+        i2c_w(gspca_dev, row);
+        reg_r(gspca_dev, 0x10c2, 5);
         *val = (gspca_dev->usb_buf[3] << 8) | gspca_dev->usb_buf[4];
-        return 0;
 }
 
-static int ov9650_init_sensor(struct gspca_dev *gspca_dev)
+static void ov9650_init_sensor(struct gspca_dev *gspca_dev)
 {
         int i;
         u16 id;
         struct sd *sd = (struct sd *) gspca_dev;
 
-        if (i2c_r2(gspca_dev, 0x1c, &id) < 0)
-                return -EINVAL;
+        i2c_r2(gspca_dev, 0x1c, &id);
+        if (gspca_dev->usb_err < 0)
+                return;