Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa...

[karo-tx-linux.git] / drivers / media / usb / dvb-usb / dib0700_core.c

diff --git a/drivers/media/usb/dvb-usb/dib0700_core.c b/drivers/media/usb/dvb-usb/dib0700_core.c
index 08acdd32e412945765a0760eaca32396bed47350..bea1b4764a66773850387cf4b7acf8981848b324 100644 (file)
--- a/drivers/media/usb/dvb-usb/dib0700_core.c
+++ b/drivers/media/usb/dvb-usb/dib0700_core.c
@@ -215,13 +215,14 @@ static int dib0700_i2c_xfer_new(struct i2c_adapter *adap, struct i2c_msg *msg,
                                                 USB_CTRL_GET_TIMEOUT);
                        if (result < 0) {
                                deb_info("i2c read error (status = %d)\n", result);
-                               break;
+                               goto unlock;
                        }
 
                        if (msg[i].len > sizeof(st->buf)) {
                                deb_info("buffer too small to fit %d bytes\n",
                                         msg[i].len);
-                               return -EIO;
+                               result = -EIO;
+                               goto unlock;
                        }
 
                        memcpy(msg[i].buf, st->buf, msg[i].len);
@@ -233,8 +234,8 @@ static int dib0700_i2c_xfer_new(struct i2c_adapter *adap, struct i2c_msg *msg,
                        /* Write request */
                        if (mutex_lock_interruptible(&d->usb_mutex) < 0) {
                                err("could not acquire lock");
-                               mutex_unlock(&d->i2c_mutex);
-                               return -EINTR;
+                               result = -EINTR;
+                               goto unlock;
                        }
                        st->buf[0] = REQUEST_NEW_I2C_WRITE;
                        st->buf[1] = msg[i].addr << 1;
@@ -247,7 +248,9 @@ static int dib0700_i2c_xfer_new(struct i2c_adapter *adap, struct i2c_msg *msg,
                        if (msg[i].len > sizeof(st->buf) - 4) {
                                deb_info("i2c message to big: %d\n",
                                         msg[i].len);
-                               return -EIO;
+                               mutex_unlock(&d->usb_mutex);
+                               result = -EIO;
+                               goto unlock;
                        }
 
                        /* The Actual i2c payload */
@@ -269,8 +272,11 @@ static int dib0700_i2c_xfer_new(struct i2c_adapter *adap, struct i2c_msg *msg,
                        }
                }
        }
+       result = i;
+
+unlock:
        mutex_unlock(&d->i2c_mutex);
-       return i;
+       return result;
 }
 
 /*
@@ -281,7 +287,7 @@ static int dib0700_i2c_xfer_legacy(struct i2c_adapter *adap,
 {
        struct dvb_usb_device *d = i2c_get_adapdata(adap);
        struct dib0700_state *st = d->priv;
-       int i,len;
+       int i, len, result;
 
        if (mutex_lock_interruptible(&d->i2c_mutex) < 0)
                return -EINTR;
@@ -298,7 +304,8 @@ static int dib0700_i2c_xfer_legacy(struct i2c_adapter *adap,
                if (msg[i].len > sizeof(st->buf) - 2) {
                        deb_info("i2c xfer to big: %d\n",
                                msg[i].len);
-                       return -EIO;
+                       result = -EIO;
+                       goto unlock;
                }
                memcpy(&st->buf[2], msg[i].buf, msg[i].len);
 
@@ -313,13 +320,15 @@ static int dib0700_i2c_xfer_legacy(struct i2c_adapter *adap,
                        if (len <= 0) {
                                deb_info("I2C read failed on address 0x%02x\n",
                                                msg[i].addr);
-                               break;
+                               result = -EIO;
+                               goto unlock;
                        }
 
                        if (msg[i + 1].len > sizeof(st->buf)) {
                                deb_info("i2c xfer buffer to small for %d\n",
                                        msg[i].len);
-                               return -EIO;
+                               result = -EIO;
+                               goto unlock;
                        }
                        memcpy(msg[i + 1].buf, st->buf, msg[i + 1].len);
 
@@ -328,14 +337,17 @@ static int dib0700_i2c_xfer_legacy(struct i2c_adapter *adap,
                        i++;
                } else {
                        st->buf[0] = REQUEST_I2C_WRITE;
-                       if (dib0700_ctrl_wr(d, st->buf, msg[i].len + 2) < 0)
-                               break;
+                       result = dib0700_ctrl_wr(d, st->buf, msg[i].len + 2);
+                       if (result < 0)
+                               goto unlock;
                }
        }
+       result = i;
+unlock:
        mutex_unlock(&d->usb_mutex);
        mutex_unlock(&d->i2c_mutex);
 
-       return i;
+       return result;
 }
 
 static int dib0700_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg *msg,