summaryrefslogtreecommitdiffstats
path: root/drivers/media/dvb-frontends/si2168_priv.h
diff options
context:
space:
mode:
authorAntti Palosaari <crope@iki.fi>2016-05-04 22:15:32 +0200
committerWolfram Sang <wsa@the-dreams.de>2016-05-04 22:39:31 +0200
commite6d7ffcdf15f40fc1cff7a3c2fd2720ce3d53e49 (patch)
treedcc3cc9ec64915e25b6bcc03956abb8178bc0dfe /drivers/media/dvb-frontends/si2168_priv.h
parent1ffcfaf19597ad26797aac3ab42d8ba6e548ef0a (diff)
downloadlinux-e6d7ffcdf15f40fc1cff7a3c2fd2720ce3d53e49.tar.gz
linux-e6d7ffcdf15f40fc1cff7a3c2fd2720ce3d53e49.tar.bz2
linux-e6d7ffcdf15f40fc1cff7a3c2fd2720ce3d53e49.zip
[media] si2168: change the i2c gate to be mux-locked
The root i2c adapter lock is then no longer held by the i2c mux during accesses behind the i2c gate, and such accesses need to take that lock just like any other ordinary i2c accesses do. So, declare the i2c gate mux-locked, and zap the code that makes the i2c accesses unlocked. But add a mutex so that firmware commands are still serialized. Signed-off-by: Antti Palosaari <crope@iki.fi> Signed-off-by: Peter Rosin <peda@axentia.se> Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
Diffstat (limited to 'drivers/media/dvb-frontends/si2168_priv.h')
-rw-r--r--drivers/media/dvb-frontends/si2168_priv.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/media/dvb-frontends/si2168_priv.h b/drivers/media/dvb-frontends/si2168_priv.h
index 165bf1412063..8a1f36d2014d 100644
--- a/drivers/media/dvb-frontends/si2168_priv.h
+++ b/drivers/media/dvb-frontends/si2168_priv.h
@@ -29,6 +29,7 @@
/* state struct */
struct si2168_dev {
+ struct mutex i2c_mutex;
struct i2c_mux_core *muxc;
struct dvb_frontend fe;
enum fe_delivery_system delivery_system;