aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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 [] = {
244 244
245/* Tuner callback to provide the proper gpio changes needed for xc2028 */ 245/* Tuner callback to provide the proper gpio changes needed for xc2028 */
246 246
247static int tm6000_tuner_callback(void *ptr, int component, int command, int arg) 247int tm6000_tuner_callback(void *ptr, int component, int command, int arg)
248{ 248{
249 int rc=0; 249 int rc=0;
250 struct tm6000_core *dev = ptr; 250 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)
236 .i2c_addr = dev->tuner_addr, 236 .i2c_addr = dev->tuner_addr,
237 }; 237 };
238 238
239 dvb->frontend->callback = tm6000_tuner_callback;
239 ret = dvb_register_frontend(&dvb->adapter, dvb->frontend); 240 ret = dvb_register_frontend(&dvb->adapter, dvb->frontend);
240 if (ret < 0) { 241 if (ret < 0) {
241 printk(KERN_ERR 242 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 {
203 V4L2_STD_PAL_M|V4L2_STD_PAL_60|V4L2_STD_NTSC_M| \ 203 V4L2_STD_PAL_M|V4L2_STD_PAL_60|V4L2_STD_NTSC_M| \
204 V4L2_STD_NTSC_M_JP|V4L2_STD_SECAM 204 V4L2_STD_NTSC_M_JP|V4L2_STD_SECAM
205 205
206/* In tm6000-cards.c */
207
208int tm6000_tuner_callback (void *ptr, int component, int command, int arg);
206/* In tm6000-core.c */ 209/* In tm6000-core.c */
207 210
208int tm6000_read_write_usb (struct tm6000_core *dev, u8 reqtype, u8 req, 211int tm6000_read_write_usb (struct tm6000_core *dev, u8 reqtype, u8 req,