Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1cdbcc5d authored by Dan Carpenter's avatar Dan Carpenter Committed by Mauro Carvalho Chehab
Browse files

[media] cxusb: unlock on error in cxusb_i2c_xfer() 



We recently introduced some new error paths which are missing their
unlocks.
Fixes: 64f7ef8a ('[media] cxusb: Don't use dynamic static allocation')

Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarMauro Carvalho Chehab <m.chehab@samsung.com>
parent e351bf25

drivers/media/usb/dvb-usb/cxusb.c

+16 −5
Original line number Diff line number Diff line
@@ -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)