p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

media: tda1004x: switch to i2c_lock_bus(..., I2C_LOCK_SEGMENT) 

Locking the root adapter for __i2c_transfer will deadlock if the
device sits behind a mux-locked I2C mux. Switch to the finer-grained
i2c_lock_bus with the I2C_LOCK_SEGMENT flag. If the device does not
sit behind a mux-locked mux, the two locking variants are equivalent.

Signed-off-by: Peter Rosin <peda@axentia.se>
Acked-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
This commit is contained in:
Peter Rosin 2018-06-20 07:18:00 +02:00 committed by Wolfram Sang
parent dfecde4076
commit 3e985b3dba
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/media/dvb-frontends/tda1004x.c
View File

@ -329,7 +329,7 @@ static int tda1004x_do_upload(struct tda1004x_state *state,
tda1004x_write_byteI(state, dspCodeCounterReg, 0); tda1004x_write_byteI(state, dspCodeCounterReg, 0);
fw_msg.addr = state->config->demod_address; fw_msg.addr = state->config->demod_address;
i2c_lock_adapter(state->i2c); i2c_lock_bus(state->i2c, I2C_LOCK_SEGMENT);
buf[0] = dspCodeInReg; buf[0] = dspCodeInReg;
while (pos != len) { while (pos != len) {
// work out how much to send this time // work out how much to send this time
@ -342,14 +342,14 @@ static int tda1004x_do_upload(struct tda1004x_state *state,
fw_msg.len = tx_size + 1; fw_msg.len = tx_size + 1;
if (__i2c_transfer(state->i2c, &fw_msg, 1) != 1) { if (__i2c_transfer(state->i2c, &fw_msg, 1) != 1) {
printk(KERN_ERR "tda1004x: Error during firmware upload\n"); printk(KERN_ERR "tda1004x: Error during firmware upload\n");
i2c_unlock_adapter(state->i2c); i2c_unlock_bus(state->i2c, I2C_LOCK_SEGMENT);
return -EIO; return -EIO;
} }
pos += tx_size; pos += tx_size;
dprintk("%s: fw_pos=0x%x\n", __func__, pos); dprintk("%s: fw_pos=0x%x\n", __func__, pos);
} }
i2c_unlock_adapter(state->i2c); i2c_unlock_bus(state->i2c, I2C_LOCK_SEGMENT);
/* give the DSP a chance to settle 03/10/05 Hac */ /* give the DSP a chance to settle 03/10/05 Hac */
msleep(100); msleep(100);