V4L/DVB: tm6000: add tuner callback for dvb frontend

Signed-off-by: Stefan Ringel <stefan.ringel@arcor.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/staging/tm6000/tm6000-cards.c b/drivers/staging/tm6000/tm6000-cards.c
index 3f4eb05164060cdf3762809ad887c5d655433e11..e42092f54c7218a639219ae215414f020188106a 100644 (file)
--- a/drivers/staging/tm6000/tm6000-cards.c
+++ b/drivers/staging/tm6000/tm6000-cards.c
@@ -244,7 +244,7 @@ struct usb_device_id tm6000_id_table [] = {
 
 /* Tuner callback to provide the proper gpio changes needed for xc2028 */
 
-static int tm6000_tuner_callback(void *ptr, int component, int command, int arg)
+int tm6000_tuner_callback(void *ptr, int component, int command, int arg)
 {
        int rc=0;
        struct tm6000_core *dev = ptr;

diff --git a/drivers/staging/tm6000/tm6000-dvb.c b/drivers/staging/tm6000/tm6000-dvb.c
index e900d6ddea308acd1590d7d30590ee7db223781b..f54f6d9ea6f4efb565bfb1e1e55711ca1dcf45a8 100644 (file)
--- a/drivers/staging/tm6000/tm6000-dvb.c
+++ b/drivers/staging/tm6000/tm6000-dvb.c
@@ -236,6 +236,7 @@ int tm6000_dvb_register(struct tm6000_core *dev)
                        .i2c_addr = dev->tuner_addr,
                };
 
+               dvb->frontend->callback = tm6000_tuner_callback;
                ret = dvb_register_frontend(&dvb->adapter, dvb->frontend);
                if (ret < 0) {
                        printk(KERN_ERR

diff --git a/drivers/staging/tm6000/tm6000.h b/drivers/staging/tm6000/tm6000.h
index 54dbdb91c52fde697fa4cecf812b9cf4910f7f55..125391c20d054ea95169e25e994feadc0a665ff5 100644 (file)
--- a/drivers/staging/tm6000/tm6000.h
+++ b/drivers/staging/tm6000/tm6000.h
@@ -203,6 +203,9 @@ struct tm6000_fh {
                        V4L2_STD_PAL_M|V4L2_STD_PAL_60|V4L2_STD_NTSC_M| \
                        V4L2_STD_NTSC_M_JP|V4L2_STD_SECAM
 
+/* In tm6000-cards.c */
+
+int tm6000_tuner_callback (void *ptr, int component, int command, int arg);
 /* In tm6000-core.c */
 
 int tm6000_read_write_usb (struct tm6000_core *dev, u8 reqtype, u8 req,