|
@@ -149,6 +149,7 @@ static int cxusb_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msg[],
|
|
|
int num)
|
|
|
{
|
|
|
struct dvb_usb_device *d = i2c_get_adapdata(adap);
|
|
|
+ int ret;
|
|
|
int i;
|
|
|
|
|
|
if (mutex_lock_interruptible(&d->i2c_mutex) < 0)
|
|
@@ -173,7 +174,8 @@ static int cxusb_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msg[],
|
|
|
if (1 + msg[i].len > sizeof(ibuf)) {
|
|
|
warn("i2c rd: len=%d is too big!\n",
|
|
|
msg[i].len);
|
|
|
- return -EOPNOTSUPP;
|
|
|
+ ret = -EOPNOTSUPP;
|
|
|
+ goto unlock;
|
|
|
}
|
|
|
obuf[0] = 0;
|
|
|
obuf[1] = msg[i].len;
|
|
@@ -193,12 +195,14 @@ static int cxusb_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msg[],
|
|
|
if (3 + msg[i].len > sizeof(obuf)) {
|
|
|
warn("i2c wr: len=%d is too big!\n",
|
|
|
msg[i].len);
|
|
|
- return -EOPNOTSUPP;
|
|
|
+ ret = -EOPNOTSUPP;
|
|
|
+ goto unlock;
|
|
|
}
|
|
|
if (1 + msg[i + 1].len > sizeof(ibuf)) {
|
|
|
warn("i2c rd: len=%d is too big!\n",
|
|
|
msg[i + 1].len);
|
|
|
- return -EOPNOTSUPP;
|
|
|
+ ret = -EOPNOTSUPP;
|
|
|
+ goto unlock;
|
|
|
}
|
|
|
obuf[0] = msg[i].len;
|
|
|
obuf[1] = msg[i+1].len;
|
|
@@ -223,7 +227,8 @@ static int cxusb_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msg[],
|
|
|
if (2 + msg[i].len > sizeof(obuf)) {
|
|
|
warn("i2c wr: len=%d is too big!\n",
|
|
|
msg[i].len);
|
|
|
- return -EOPNOTSUPP;
|
|
|
+ ret = -EOPNOTSUPP;
|
|
|
+ goto unlock;
|
|
|
}
|
|
|
obuf[0] = msg[i].addr;
|
|
|
obuf[1] = msg[i].len;
|
|
@@ -237,8 +242,14 @@ static int cxusb_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msg[],
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ if (i == num)
|
|
|
+ ret = num;
|
|
|
+ else
|
|
|
+ ret = -EREMOTEIO;
|
|
|
+
|
|
|
+unlock:
|
|
|
mutex_unlock(&d->i2c_mutex);
|
|
|
- return i == num ? num : -EREMOTEIO;
|
|
|
+ return ret;
|
|
|
}
|
|
|
|
|
|
static u32 cxusb_i2c_func(struct i2c_adapter *adapter)
|