[media] lmedm04: Do not unlock mutex if mutex_lock_interruptible failed
There are a couple of places where mutex_unlock() is called even if mutex_lock_interruptible() failed. The patch fixes the issue. Found by Linux Driver Verification project (linuxtesting.org). Signed-off-by: Alexey Khoroshilov <khoroshilov@ispras.ru> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
parent
eeaaf817c7
commit
6f030abf9a
|
@ -666,9 +666,10 @@ static int lme2510_streaming_ctrl(struct dvb_usb_adapter *adap, int onoff)
|
||||||
else {
|
else {
|
||||||
deb_info(1, "STM Steam Off");
|
deb_info(1, "STM Steam Off");
|
||||||
/* mutex is here only to avoid collision with I2C */
|
/* mutex is here only to avoid collision with I2C */
|
||||||
ret = mutex_lock_interruptible(&adap->dev->i2c_mutex);
|
if (mutex_lock_interruptible(&adap->dev->i2c_mutex) < 0)
|
||||||
|
return -EAGAIN;
|
||||||
|
|
||||||
ret |= lme2510_usb_talk(adap->dev, clear_reg_3,
|
ret = lme2510_usb_talk(adap->dev, clear_reg_3,
|
||||||
sizeof(clear_reg_3), rbuf, rlen);
|
sizeof(clear_reg_3), rbuf, rlen);
|
||||||
st->stream_on = 0;
|
st->stream_on = 0;
|
||||||
st->i2c_talk_onoff = 1;
|
st->i2c_talk_onoff = 1;
|
||||||
|
@ -1099,12 +1100,13 @@ static int lme2510_powerup(struct dvb_usb_device *d, int onoff)
|
||||||
static u8 rbuf[1];
|
static u8 rbuf[1];
|
||||||
int ret, len = 3, rlen = 1;
|
int ret, len = 3, rlen = 1;
|
||||||
|
|
||||||
ret = mutex_lock_interruptible(&d->i2c_mutex);
|
if (mutex_lock_interruptible(&d->i2c_mutex) < 0)
|
||||||
|
return -EAGAIN;
|
||||||
|
|
||||||
if (onoff)
|
if (onoff)
|
||||||
ret |= lme2510_usb_talk(d, lnb_on, len, rbuf, rlen);
|
ret = lme2510_usb_talk(d, lnb_on, len, rbuf, rlen);
|
||||||
else
|
else
|
||||||
ret |= lme2510_usb_talk(d, lnb_off, len, rbuf, rlen);
|
ret = lme2510_usb_talk(d, lnb_off, len, rbuf, rlen);
|
||||||
|
|
||||||
st->i2c_talk_onoff = 1;
|
st->i2c_talk_onoff = 1;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue