projects
/
platform
/
kernel
/
linux-3.10.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
1b7d7fa
)
upstream: [media] rtl2832: Fix deadlock on i2c mux select function
author
Luis Alves
<ljalvs@gmail.com>
Wed, 4 Dec 2013 23:21:22 +0000
(20:21 -0300)
committer
Chanho Park
<chanho61.park@samsung.com>
Tue, 18 Nov 2014 02:54:49 +0000
(11:54 +0900)
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>
drivers/media/dvb-frontends/rtl2832.c
patch
|
blob
|
history
diff --git
a/drivers/media/dvb-frontends/rtl2832.c
b/drivers/media/dvb-frontends/rtl2832.c
index
f60ab33
..
cad0944
100644
(file)
--- a/
drivers/media/dvb-frontends/rtl2832.c
+++ b/
drivers/media/dvb-frontends/rtl2832.c
@@
-923,7
+923,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;
@@
-936,7
+936,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;