diff options
Diffstat (limited to 'drivers/media/common/tuners/xc5000.c')
-rw-r--r-- | drivers/media/common/tuners/xc5000.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/media/common/tuners/xc5000.c b/drivers/media/common/tuners/xc5000.c index 43d35bdb221f..ceae6db901ec 100644 --- a/drivers/media/common/tuners/xc5000.c +++ b/drivers/media/common/tuners/xc5000.c | |||
@@ -212,7 +212,7 @@ static void xc5000_TunerReset(struct dvb_frontend *fe) | |||
212 | dprintk(1, "%s()\n", __func__); | 212 | dprintk(1, "%s()\n", __func__); |
213 | 213 | ||
214 | if (priv->cfg->tuner_callback) { | 214 | if (priv->cfg->tuner_callback) { |
215 | ret = priv->cfg->tuner_callback(priv->cfg->priv, | 215 | ret = priv->cfg->tuner_callback(priv->devptr, |
216 | XC5000_TUNER_RESET, 0); | 216 | XC5000_TUNER_RESET, 0); |
217 | if (ret) | 217 | if (ret) |
218 | printk(KERN_ERR "xc5000: reset failed\n"); | 218 | printk(KERN_ERR "xc5000: reset failed\n"); |
@@ -900,9 +900,9 @@ static const struct dvb_tuner_ops xc5000_tuner_ops = { | |||
900 | .get_status = xc5000_get_status | 900 | .get_status = xc5000_get_status |
901 | }; | 901 | }; |
902 | 902 | ||
903 | struct dvb_frontend * xc5000_attach(struct dvb_frontend *fe, | 903 | struct dvb_frontend *xc5000_attach(struct dvb_frontend *fe, |
904 | struct i2c_adapter *i2c, | 904 | struct i2c_adapter *i2c, |
905 | struct xc5000_config *cfg) | 905 | struct xc5000_config *cfg, void *devptr) |
906 | { | 906 | { |
907 | struct xc5000_priv *priv = NULL; | 907 | struct xc5000_priv *priv = NULL; |
908 | u16 id = 0; | 908 | u16 id = 0; |
@@ -916,6 +916,7 @@ struct dvb_frontend * xc5000_attach(struct dvb_frontend *fe, | |||
916 | priv->cfg = cfg; | 916 | priv->cfg = cfg; |
917 | priv->bandwidth = BANDWIDTH_6_MHZ; | 917 | priv->bandwidth = BANDWIDTH_6_MHZ; |
918 | priv->i2c = i2c; | 918 | priv->i2c = i2c; |
919 | priv->devptr = devptr; | ||
919 | 920 | ||
920 | /* Check if firmware has been loaded. It is possible that another | 921 | /* Check if firmware has been loaded. It is possible that another |
921 | instance of the driver has loaded the firmware. | 922 | instance of the driver has loaded the firmware. |