V4L/DVB (7396): saa7134: fixed pointer in tuner callback

The pointer transferred directly points to the saa7134_dev
structure

Signed-off-by: Hartmut Hackmann <hartmut.hackmann@t-online.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

diff --git a/drivers/media/video/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c
index bab8498..b622d97 100644 (file)
--- 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,
 
 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/drivers/media/video/saa7134/saa7134-dvb.c b/drivers/media/video/saa7134/saa7134-dvb.c
index 07614a8..e26c3bc 100644 (file)
--- 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)
                struct xc2028_config cfg = {
                        .i2c_adap  = &dev->i2c_adap,
                        .i2c_addr  = 0x61,
-                       .video_dev = dev->i2c_adap.algo_data,
                };
                fe = dvb_attach(xc2028_attach, dev->dvb.frontend, &cfg);
                if (!fe) {