aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/common/tuners/xc5000.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/common/tuners/xc5000.c')
-rw-r--r--drivers/media/common/tuners/xc5000.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/media/common/tuners/xc5000.c b/drivers/media/common/tuners/xc5000.c
index ccc4dae4126a..f9c2bb917f54 100644
--- a/drivers/media/common/tuners/xc5000.c
+++ b/drivers/media/common/tuners/xc5000.c
@@ -58,8 +58,6 @@ struct xc5000_priv {
58 u32 bandwidth; 58 u32 bandwidth;
59 u8 video_standard; 59 u8 video_standard;
60 u8 rf_mode; 60 u8 rf_mode;
61
62 int (*tuner_callback) (void *priv, int command, int arg);
63}; 61};
64 62
65/* Misc Defines */ 63/* Misc Defines */
@@ -232,10 +230,11 @@ static void xc5000_TunerReset(struct dvb_frontend *fe)
232 230
233 dprintk(1, "%s()\n", __func__); 231 dprintk(1, "%s()\n", __func__);
234 232
235 if (priv->tuner_callback) { 233 if (fe->callback) {
236 ret = priv->tuner_callback(((fe->dvb) && (fe->dvb->priv)) ? 234 ret = fe->callback(((fe->dvb) && (fe->dvb->priv)) ?
237 fe->dvb->priv : 235 fe->dvb->priv :
238 priv->i2c_props.adap->algo_data, 236 priv->i2c_props.adap->algo_data,
237 DVB_FRONTEND_COMPONENT_TUNER,
239 XC5000_TUNER_RESET, 0); 238 XC5000_TUNER_RESET, 0);
240 if (ret) 239 if (ret)
241 printk(KERN_ERR "xc5000: reset failed\n"); 240 printk(KERN_ERR "xc5000: reset failed\n");
@@ -975,7 +974,6 @@ struct dvb_frontend *xc5000_attach(struct dvb_frontend *fe,
975 /* new tuner instance */ 974 /* new tuner instance */
976 priv->bandwidth = BANDWIDTH_6_MHZ; 975 priv->bandwidth = BANDWIDTH_6_MHZ;
977 priv->if_khz = cfg->if_khz; 976 priv->if_khz = cfg->if_khz;
978 priv->tuner_callback = cfg->tuner_callback;
979 977
980 fe->tuner_priv = priv; 978 fe->tuner_priv = priv;
981 break; 979 break;