diff options
| author | Hartmut Hackmann <hartmut.hackmann@t-online.de> | 2008-03-20 21:22:45 +0100 |
|---|---|---|
| committer | Hartmut Hackmann <hartmut.hackmann@t-online.de> | 2008-03-20 21:22:45 +0100 |
| commit | 865624af6da8960703f03756ab73c5438c1eff23 (patch) | |
| tree | 661fd14edfd33cd7132a371a533ff1c054ee8596 /linux/drivers/media/video/saa7134 | |
| parent | 96b41e376ce705c162a858f8ea22a367b39f91a9 (diff) | |
| download | mediapointer-dvb-s2-865624af6da8960703f03756ab73c5438c1eff23.tar.gz mediapointer-dvb-s2-865624af6da8960703f03756ab73c5438c1eff23.tar.bz2 | |
saa7134: fixed pointer in tuner callback
From: Hartmut Hackmann <hartmut.hackmann@t-online.de>
The pointer transferred directly points to the saa7134_dev
structure
Signed-off-by: Hartmut Hackmann <hartmut.hackmann@t-online.de>
Diffstat (limited to 'linux/drivers/media/video/saa7134')
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134-cards.c | 3 | ||||
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134-dvb.c | 1 |
2 files changed, 1 insertions, 3 deletions
diff --git a/linux/drivers/media/video/saa7134/saa7134-cards.c b/linux/drivers/media/video/saa7134/saa7134-cards.c index db9f110fb..9d50c5660 100644 --- a/linux/drivers/media/video/saa7134/saa7134-cards.c +++ b/linux/drivers/media/video/saa7134/saa7134-cards.c @@ -5341,8 +5341,7 @@ static int saa7134_tda8290_callback(struct saa7134_dev *dev, int saa7134_tuner_callback(void *priv, int command, int arg) { - struct i2c_algo_bit_data *i2c_algo = priv; - struct saa7134_dev *dev = i2c_algo->data; + struct saa7134_dev *dev = priv; if (dev != NULL) { switch (dev->tuner_type) { case TUNER_PHILIPS_TDA8290: diff --git a/linux/drivers/media/video/saa7134/saa7134-dvb.c b/linux/drivers/media/video/saa7134/saa7134-dvb.c index ceec099ee..951e5e58c 100644 --- a/linux/drivers/media/video/saa7134/saa7134-dvb.c +++ b/linux/drivers/media/video/saa7134/saa7134-dvb.c @@ -1206,7 +1206,6 @@ static int dvb_init(struct saa7134_dev *dev) struct xc2028_config cfg = { .i2c_adap = &dev->i2c_adap, .i2c_addr = 0x61, - .video_dev = dev, }; fe = dvb_attach(xc2028_attach, dev->dvb.frontend, &cfg); if (!fe) { |