aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Ringel <[email protected]>2010-02-05 19:57:06 -0300
committerMauro Carvalho Chehab <[email protected]>2010-05-18 00:43:51 -0300
commite78c8f22b536e646032dd9b9f396305d0893e0cd (patch)
tree3d12406a18fafccaf1d120c60c28438e8d38fa6c
parent20cabed421399a5f0f1b33742d765cbdfad4ac79 (diff)
V4L/DVB: tm6000: add tuner callback for dvb frontend
Signed-off-by: Stefan Ringel <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
-rw-r--r--drivers/staging/tm6000/tm6000-cards.c2
-rw-r--r--drivers/staging/tm6000/tm6000-dvb.c1
-rw-r--r--drivers/staging/tm6000/tm6000.h3
3 files changed, 5 insertions, 1 deletions
diff --git a/drivers/staging/tm6000/tm6000-cards.c b/drivers/staging/tm6000/tm6000-cards.c
index 3f4eb0516406..e42092f54c72 100644
--- 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 e900d6ddea30..f54f6d9ea6f4 100644
--- 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 54dbdb91c52f..125391c20d05 100644
--- 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,