V4L/DVB (8950): xc5000: prevent an OOPS if analog driver is unloaded while digital is in use
Prevent an OOPS if xc5000_attach was called by tuner.ko before being called by
the DVB adapter driver. The OOPS occurs when a digital tune request is made
after tuner.ko is unloaded.
When tuner.ko is unloaded, it takes the xc5000_config structure with it.
Rather than storing a pointer to the xc5000_config structure, just store the
if_khz and tuner_callback inside the xc5000_priv internal state structure.
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
diff --git a/drivers/media/common/tuners/xc5000.c b/drivers/media/common/tuners/xc5000.c
index 1850f7b..72efc65 100644
--- a/drivers/media/common/tuners/xc5000.c
+++ b/drivers/media/common/tuners/xc5000.c
@@ -50,17 +50,17 @@
#define XC5000_DEFAULT_FIRMWARE_SIZE 12332
struct xc5000_priv {
- struct xc5000_config *cfg;
-
struct tuner_i2c_props i2c_props;
struct list_head hybrid_tuner_instance_list;
+ u32 if_khz;
u32 freq_hz;
u32 bandwidth;
u8 video_standard;
u8 rf_mode;
void *devptr;
+ int (*tuner_callback) (void *priv, int command, int arg);
};
/* Misc Defines */
@@ -233,9 +233,8 @@
dprintk(1, "%s()\n", __func__);
- if (priv->cfg->tuner_callback) {
- ret = priv->cfg->tuner_callback(priv->devptr,
- XC5000_TUNER_RESET, 0);
+ if (priv->tuner_callback) {
+ ret = priv->tuner_callback(priv->devptr, XC5000_TUNER_RESET, 0);
if (ret)
printk(KERN_ERR "xc5000: reset failed\n");
} else
@@ -692,10 +691,10 @@
return -EREMOTEIO;
}
- ret = xc_set_IF_frequency(priv, priv->cfg->if_khz);
+ ret = xc_set_IF_frequency(priv, priv->if_khz);
if (ret != XC_RESULT_SUCCESS) {
printk(KERN_ERR "xc5000: xc_Set_IF_frequency(%d) failed\n",
- priv->cfg->if_khz);
+ priv->if_khz);
return -EIO;
}
@@ -972,9 +971,10 @@
break;
case 1:
/* new tuner instance */
- priv->cfg = cfg;
priv->bandwidth = BANDWIDTH_6_MHZ;
priv->devptr = devptr;
+ priv->if_khz = cfg->if_khz;
+ priv->tuner_callback = cfg->tuner_callback;
fe->tuner_priv = priv;
break;