aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/dvb-frontends/m88ds3103_priv.h
diff options
context:
space:
mode:
authorAntti Palosaari <crope@iki.fi>2013-11-19 20:32:42 -0300
committerMauro Carvalho Chehab <m.chehab@samsung.com>2013-12-19 09:21:02 -0200
commit44b9055b4b058d7b02bf0380158627f9be79b9e5 (patch)
tree9ddaf8adc32e1c78b3afcee4a70143ef61eaf727 /drivers/media/dvb-frontends/m88ds3103_priv.h
parent[media] m88ds3103: do not use dynamic stack allocation (diff)
downloadlinux-dev-44b9055b4b058d7b02bf0380158627f9be79b9e5.tar.xz
linux-dev-44b9055b4b058d7b02bf0380158627f9be79b9e5.zip
[media] m88ds3103: use I2C mux for tuner I2C adapter
Switch standard I2C adapter to muxed I2C adapter. David reported that I2C adapter implementation caused deadlock. I discussed with Jean and he suggested to implement it as a multiplexed i2c adapter because tuner I2C bus could be seen like own I2C segment. Reported-by: David Howells <dhowells@redhat.com> Cc: Jean Delvare <khali@linux-fr.org> 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/m88ds3103_priv.h')
-rw-r--r--drivers/media/dvb-frontends/m88ds3103_priv.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/media/dvb-frontends/m88ds3103_priv.h b/drivers/media/dvb-frontends/m88ds3103_priv.h
index f3d0867fedc4..322db4d59df3 100644
--- a/drivers/media/dvb-frontends/m88ds3103_priv.h
+++ b/drivers/media/dvb-frontends/m88ds3103_priv.h
@@ -25,6 +25,7 @@
#include "m88ds3103.h"
#include "dvb_math.h"
#include <linux/firmware.h>
+#include <linux/i2c-mux.h>
#define M88DS3103_FIRMWARE "dvb-demod-m88ds3103.fw"
#define M88DS3103_MCLK_KHZ 96000
@@ -38,7 +39,7 @@ struct m88ds3103_priv {
fe_delivery_system_t delivery_system;
fe_status_t fe_status;
bool warm; /* FW running */
- struct i2c_adapter i2c_adapter;
+ struct i2c_adapter *i2c_adapter;
};
struct m88ds3103_reg_val {