diff options
Diffstat (limited to 'drivers/media/video')
-rw-r--r-- | drivers/media/video/saa7134/saa7134-cards.c | 3 | ||||
-rw-r--r-- | drivers/media/video/saa7134/saa7134-dvb.c | 1 |
2 files changed, 1 insertions, 3 deletions
diff --git a/drivers/media/video/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c index bab8498046c8..b622d979e634 100644 --- a/drivers/media/video/saa7134/saa7134-cards.c +++ b/drivers/media/video/saa7134/saa7134-cards.c | |||
@@ -5258,8 +5258,7 @@ static int saa7134_tda8290_callback(struct saa7134_dev *dev, | |||
5258 | 5258 | ||
5259 | int saa7134_tuner_callback(void *priv, int command, int arg) | 5259 | int saa7134_tuner_callback(void *priv, int command, int arg) |
5260 | { | 5260 | { |
5261 | struct i2c_algo_bit_data *i2c_algo = priv; | 5261 | struct saa7134_dev *dev = priv; |
5262 | struct saa7134_dev *dev = i2c_algo->data; | ||
5263 | if (dev != NULL) { | 5262 | if (dev != NULL) { |
5264 | switch (dev->tuner_type) { | 5263 | switch (dev->tuner_type) { |
5265 | case TUNER_PHILIPS_TDA8290: | 5264 | case TUNER_PHILIPS_TDA8290: |
diff --git a/drivers/media/video/saa7134/saa7134-dvb.c b/drivers/media/video/saa7134/saa7134-dvb.c index 07614a8d8949..e26c3bc2d210 100644 --- a/drivers/media/video/saa7134/saa7134-dvb.c +++ b/drivers/media/video/saa7134/saa7134-dvb.c | |||
@@ -1199,7 +1199,6 @@ static int dvb_init(struct saa7134_dev *dev) | |||
1199 | struct xc2028_config cfg = { | 1199 | struct xc2028_config cfg = { |
1200 | .i2c_adap = &dev->i2c_adap, | 1200 | .i2c_adap = &dev->i2c_adap, |
1201 | .i2c_addr = 0x61, | 1201 | .i2c_addr = 0x61, |
1202 | .video_dev = dev->i2c_adap.algo_data, | ||
1203 | }; | 1202 | }; |
1204 | fe = dvb_attach(xc2028_attach, dev->dvb.frontend, &cfg); | 1203 | fe = dvb_attach(xc2028_attach, dev->dvb.frontend, &cfg); |
1205 | if (!fe) { | 1204 | if (!fe) { |