diff options
| author | Luis Alves <ljalvs@gmail.com> | 2013-12-05 00:21:22 +0100 |
|---|---|---|
| committer | Mauro Carvalho Chehab <m.chehab@samsung.com> | 2014-03-05 19:39:34 +0100 |
| commit | 0db5c800aa460c9f3cb142d65b5893c47ddcecb8 (patch) | |
| tree | 9c44e9b3e5585a657aeb8687f1a4151997af29db /drivers/media/dvb-frontends/rtl2832.c | |
| parent | [media] rtl2832: add muxed I2C adapter for demod itself (diff) | |
| download | linux-0db5c800aa460c9f3cb142d65b5893c47ddcecb8.tar.xz linux-0db5c800aa460c9f3cb142d65b5893c47ddcecb8.zip | |
[media] rtl2832: Fix deadlock on i2c mux select function
Signed-off-by: Luis Alves <ljalvs@gmail.com>
Signed-off-by: Antti Palosaari <crope@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Diffstat (limited to 'drivers/media/dvb-frontends/rtl2832.c')
| -rw-r--r-- | drivers/media/dvb-frontends/rtl2832.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/dvb-frontends/rtl2832.c b/drivers/media/dvb-frontends/rtl2832.c index c0366a8640c7..cfc54388a15e 100644 --- a/drivers/media/dvb-frontends/rtl2832.c +++ b/drivers/media/dvb-frontends/rtl2832.c @@ -917,7 +917,7 @@ static int rtl2832_select(struct i2c_adapter *adap, void *mux_priv, u32 chan_id) buf[0] = 0x00; buf[1] = 0x01; - ret = i2c_transfer(adap, msg, 1); + ret = __i2c_transfer(adap, msg, 1); if (ret != 1) goto err; @@ -930,7 +930,7 @@ static int rtl2832_select(struct i2c_adapter *adap, void *mux_priv, u32 chan_id) else buf[1] = 0x10; /* close */ - ret = i2c_transfer(adap, msg, 1); + ret = __i2c_transfer(adap, msg, 1); if (ret != 1) goto err; |