| From 1cdbcc5db4e6d51ce9bb1313195167cada9aa6e9 Mon Sep 17 00:00:00 2001 |
| From: Dan Carpenter <dan.carpenter@oracle.com> |
| Date: Fri, 22 Nov 2013 04:55:43 -0300 |
| Subject: media: cxusb: unlock on error in cxusb_i2c_xfer() |
| |
| From: Dan Carpenter <dan.carpenter@oracle.com> |
| |
| commit 1cdbcc5db4e6d51ce9bb1313195167cada9aa6e9 upstream. |
| |
| We recently introduced some new error paths which are missing their |
| unlocks. |
| Fixes: 64f7ef8afbf8 ('[media] cxusb: Don't use dynamic static allocation') |
| |
| Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> |
| Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/media/usb/dvb-usb/cxusb.c | 21 ++++++++++++++++----- |
| 1 file changed, 16 insertions(+), 5 deletions(-) |
| |
| --- a/drivers/media/usb/dvb-usb/cxusb.c |
| +++ b/drivers/media/usb/dvb-usb/cxusb.c |
| @@ -149,6 +149,7 @@ static int cxusb_i2c_xfer(struct i2c_ada |
| 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_ada |
| 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_ada |
| 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_ada |
| 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_ada |
| } |
| } |
| |
| + 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) |