summaryrefslogtreecommitdiffstats
path: root/drivers/media/dvb-frontends/rtl2832.c
diff options
context:
space:
mode:
authorLuis Alves <ljalvs@gmail.com>2013-12-04 20:21:22 -0300
committerMauro Carvalho Chehab <m.chehab@samsung.com>2014-03-05 15:39:34 -0300
commit0db5c800aa460c9f3cb142d65b5893c47ddcecb8 (patch)
tree9c44e9b3e5585a657aeb8687f1a4151997af29db /drivers/media/dvb-frontends/rtl2832.c
parent0ea872d43e9a68d1b540f382d139e9d99d9f8301 (diff)
downloadop-kernel-dev-0db5c800aa460c9f3cb142d65b5893c47ddcecb8.zip
op-kernel-dev-0db5c800aa460c9f3cb142d65b5893c47ddcecb8.tar.gz
[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.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/dvb-frontends/rtl2832.c b/drivers/media/dvb-frontends/rtl2832.c
index c0366a8..cfc5438 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;
OpenPOWER on IntegriCloud