openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

[media] it913x ver 1.26 change to remove interruptible mutex locks 

Some virtual I2C commands are missed along some PID filtering
commands resulting complete stall of driver.

Since dvb-usb cannot handle the -EAGAIN error and commands
generally should not be missed mutex_lock is used instead.

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Malcolm Priestley 2012-02-12 07:29:38 -03:00 committed by Mauro Carvalho Chehab
parent c6e8d86fff
commit 46f3da990b
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
drivers/media/dvb/dvb-usb/it913x.c
View File

@ -263,8 +263,8 @@ static int it913x_pid_filter_ctrl(struct dvb_usb_adapter *adap, int onoff)
int ret; int ret;
u8 pro = (adap->id == 0) ? DEV_0_DMOD : DEV_1_DMOD; u8 pro = (adap->id == 0) ? DEV_0_DMOD : DEV_1_DMOD;
if (mutex_lock_interruptible(&adap->dev->i2c_mutex) < 0) mutex_lock(&adap->dev->i2c_mutex);
return -EAGAIN;
deb_info(1, "PID_C (%02x)", onoff); deb_info(1, "PID_C (%02x)", onoff);
ret = it913x_wr_reg(udev, pro, PID_EN, onoff); ret = it913x_wr_reg(udev, pro, PID_EN, onoff);
@ -280,8 +280,8 @@ static int it913x_pid_filter(struct dvb_usb_adapter *adap,
int ret; int ret;
u8 pro = (adap->id == 0) ? DEV_0_DMOD : DEV_1_DMOD; u8 pro = (adap->id == 0) ? DEV_0_DMOD : DEV_1_DMOD;
if (mutex_lock_interruptible(&adap->dev->i2c_mutex) < 0) mutex_lock(&adap->dev->i2c_mutex);
return -EAGAIN;
deb_info(1, "PID_F (%02x)", onoff); deb_info(1, "PID_F (%02x)", onoff);
ret = it913x_wr_reg(udev, pro, PID_LSB, (u8)(pid & 0xff)); ret = it913x_wr_reg(udev, pro, PID_LSB, (u8)(pid & 0xff));
@ -316,8 +316,8 @@ static int it913x_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msg[],
int ret; int ret;
u32 reg; u32 reg;
u8 pro; u8 pro;
if (mutex_lock_interruptible(&d->i2c_mutex) < 0)
return -EAGAIN; mutex_lock(&d->i2c_mutex);
debug_data_snipet(1, "Message out", msg[0].buf); debug_data_snipet(1, "Message out", msg[0].buf);
deb_info(2, "num of messages %d address %02x", num, msg[0].addr); deb_info(2, "num of messages %d address %02x", num, msg[0].addr);
@ -358,8 +358,7 @@ static int it913x_rc_query(struct dvb_usb_device *d)
int ret; int ret;
u32 key; u32 key;
/* Avoid conflict with frontends*/ /* Avoid conflict with frontends*/
if (mutex_lock_interruptible(&d->i2c_mutex) < 0) mutex_lock(&d->i2c_mutex);
return -EAGAIN;
ret = it913x_io(d->udev, READ_LONG, PRO_LINK, CMD_IR_GET, ret = it913x_io(d->udev, READ_LONG, PRO_LINK, CMD_IR_GET,
0, 0, &ibuf[0], sizeof(ibuf)); 0, 0, &ibuf[0], sizeof(ibuf));
@ -603,15 +602,15 @@ static int it913x_streaming_ctrl(struct dvb_usb_adapter *adap, int onoff)
int ret = 0; int ret = 0;
u8 pro = (adap->id == 0) ? DEV_0_DMOD : DEV_1_DMOD; u8 pro = (adap->id == 0) ? DEV_0_DMOD : DEV_1_DMOD;
if (mutex_lock_interruptible(&adap->dev->i2c_mutex) < 0)
return -EAGAIN;
deb_info(1, "STM (%02x)", onoff); deb_info(1, "STM (%02x)", onoff);
if (!onoff) if (!onoff) {
mutex_lock(&adap->dev->i2c_mutex);
ret = it913x_wr_reg(adap->dev->udev, pro, PID_RST, 0x1); ret = it913x_wr_reg(adap->dev->udev, pro, PID_RST, 0x1);
mutex_unlock(&adap->dev->i2c_mutex);
mutex_unlock(&adap->dev->i2c_mutex); }
return ret; return ret;
} }
@ -885,5 +884,5 @@ module_usb_driver(it913x_driver);
MODULE_AUTHOR("Malcolm Priestley <tvboxspy@gmail.com>"); MODULE_AUTHOR("Malcolm Priestley <tvboxspy@gmail.com>");
MODULE_DESCRIPTION("it913x USB 2 Driver"); MODULE_DESCRIPTION("it913x USB 2 Driver");
MODULE_VERSION("1.25"); MODULE_VERSION("1.26");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");