8 files changed, 61 insertions, 55 deletions

diff --git a/drivers/media/common/tuners/Kconfig b/drivers/media/common/tuners/Kconfig
index d6206540476b..85482960d012 100644
--- a/drivers/media/common/tuners/Kconfig
+++ b/drivers/media/common/tuners/Kconfig
@@ -21,6 +21,7 @@ config MEDIA_TUNER
         tristate
         default VIDEO_MEDIA && I2C
         depends on VIDEO_MEDIA && I2C
+        select FW_LOADER if !MEDIA_TUNER_CUSTOMIZE && HOTPLUG
         select MEDIA_TUNER_XC2028 if !MEDIA_TUNER_CUSTOMIZE && HOTPLUG
         select MEDIA_TUNER_XC5000 if !MEDIA_TUNER_CUSTOMIZE && HOTPLUG
         select MEDIA_TUNER_MT20XX if !MEDIA_TUNER_CUSTOMIZE
diff --git a/drivers/media/common/tuners/mxl5005s.c b/drivers/media/common/tuners/mxl5005s.c
index 5d05b5390f66..0dc2bef9f6a3 100644
--- a/drivers/media/common/tuners/mxl5005s.c
+++ b/drivers/media/common/tuners/mxl5005s.c
@@ -101,7 +101,7 @@ enum {
         MXL_QAM,
         MXL_ANALOG_CABLE,
         MXL_ANALOG_OTA
-} tuner_modu_type;
+};
 
 /* MXL5005 Tuner Register Struct */
 struct TunerReg {
@@ -194,7 +194,7 @@ enum {
         RFSYN_DIVM,                /* 88 */
         DN_BYPASS_AGC_I2C          /* 89 */
 #endif
-} MXL5005_ControlName;
+};
 
 /*
  * The following context is source code provided by MaxLinear.
diff --git a/drivers/media/common/tuners/tda18271-common.c b/drivers/media/common/tuners/tda18271-common.c
index 42b5f5d4bfe6..f1894fec32b9 100644
--- a/drivers/media/common/tuners/tda18271-common.c
+++ b/drivers/media/common/tuners/tda18271-common.c
@@ -648,11 +648,11 @@ int tda18271_calc_rf_cal(struct dvb_frontend *fe, u32 *freq)
         unsigned char *regs = priv->tda18271_regs;
         u8 val;
 
-        tda18271_lookup_map(fe, RF_CAL, freq, &val);
+        int ret = tda18271_lookup_map(fe, RF_CAL, freq, &val);
 
         regs[R_EB14] = val;
 
-        return 0;
+        return ret;
 }
 
 /*
diff --git a/drivers/media/common/tuners/tda827x.c b/drivers/media/common/tuners/tda827x.c
index d30d2c9094d9..8555d9cf9051 100644
--- a/drivers/media/common/tuners/tda827x.c
+++ b/drivers/media/common/tuners/tda827x.c
@@ -418,13 +418,13 @@ static void tda827xa_lna_gain(struct dvb_frontend *fe, int high,
         unsigned char buf[] = {0x22, 0x01};
         int arg;
         int gp_func;
-        struct i2c_msg msg = { .addr = priv->cfg->switch_addr, .flags = 0,
-                               .buf = buf, .len = sizeof(buf) };
+        struct i2c_msg msg = { .flags = 0, .buf = buf, .len = sizeof(buf) };
 
         if (NULL == priv->cfg) {
                 dprintk("tda827x_config not defined, cannot set LNA gain!\n");
                 return;
         }
+        msg.addr = priv->cfg->switch_addr;
         if (priv->cfg->config) {
                 if (high)
                         dprintk("setting LNA to high gain\n");
diff --git a/drivers/media/common/tuners/tea5761.c b/drivers/media/common/tuners/tea5761.c
index b93cdef9ac73..b23dadeecd05 100644
--- a/drivers/media/common/tuners/tea5761.c
+++ b/drivers/media/common/tuners/tea5761.c
@@ -295,7 +295,7 @@ struct dvb_frontend *tea5761_attach(struct dvb_frontend *fe,
 {
         struct tea5761_priv *priv = NULL;
 
-        if (tea5761_autodetection(i2c_adap, i2c_addr) == EINVAL)
+        if (tea5761_autodetection(i2c_adap, i2c_addr) != 0)
                 return NULL;
 
         priv = kzalloc(sizeof(struct tea5761_priv), GFP_KERNEL);
diff --git a/drivers/media/common/tuners/tuner-i2c.h b/drivers/media/common/tuners/tuner-i2c.h
index 3ad6c8e0b04c..cb1c7141f0c6 100644
--- a/drivers/media/common/tuners/tuner-i2c.h
+++ b/drivers/media/common/tuners/tuner-i2c.h
@@ -170,4 +170,12 @@ __fail:									\
         __ret;                                                          \
 })
 
+#define hybrid_tuner_report_instance_count(state)                       \
+({                                                                      \
+        int __ret = 0;                                                  \
+        if (state)                                                      \
+                __ret = state->i2c_props.count;                         \
+        __ret;                                                          \
+})
+
 #endif /* __TUNER_I2C_H__ */
diff --git a/drivers/media/common/tuners/tuner-simple.c b/drivers/media/common/tuners/tuner-simple.c
index be8d903171b7..266c255cf0d8 100644
--- a/drivers/media/common/tuners/tuner-simple.c
+++ b/drivers/media/common/tuners/tuner-simple.c
@@ -1018,8 +1018,10 @@ struct dvb_frontend *simple_tuner_attach(struct dvb_frontend *fe,
                         fe->ops.i2c_gate_ctrl(fe, 1);
 
                 if (1 != i2c_transfer(i2c_adap, &msg, 1))
-                        tuner_warn("unable to probe %s, proceeding anyway.",
-                                   tuners[type].name);
+                        printk(KERN_WARNING "tuner-simple %d-%04x: "
+                               "unable to probe %s, proceeding anyway.",
+                               i2c_adapter_id(i2c_adap), i2c_addr,
+                               tuners[type].name);
 
                 if (fe->ops.i2c_gate_ctrl)
                         fe->ops.i2c_gate_ctrl(fe, 0);
diff --git a/drivers/media/common/tuners/tuner-xc2028.c b/drivers/media/common/tuners/tuner-xc2028.c
index 9e9003cffc7f..0cbde17bfbb7 100644
--- a/drivers/media/common/tuners/tuner-xc2028.c
+++ b/drivers/media/common/tuners/tuner-xc2028.c
@@ -46,7 +46,7 @@ module_param_string(firmware_name, firmware_name, sizeof(firmware_name), 0);
 MODULE_PARM_DESC(firmware_name, "Firmware file name. Allows overriding the "
                                 "default firmware name\n");
 
-static LIST_HEAD(xc2028_list);
+static LIST_HEAD(hybrid_tuner_instance_list);
 static DEFINE_MUTEX(xc2028_list_mutex);
 
 /* struct for storing firmware table */
@@ -68,12 +68,11 @@ struct firmware_properties {
 };
 
 struct xc2028_data {
-        struct list_head        xc2028_list;
+        struct list_head        hybrid_tuner_instance_list;
         struct tuner_i2c_props  i2c_props;
         int                     (*tuner_callback) (void *dev,
                                                    int command, int arg);
         void                    *video_dev;
-        int                     count;
         __u32                   frequency;
 
         struct firmware_description *firm;
@@ -1072,20 +1071,19 @@ static int xc2028_dvb_release(struct dvb_frontend *fe)
 
         mutex_lock(&xc2028_list_mutex);
 
-        priv->count--;
-
-        if (!priv->count) {
-                list_del(&priv->xc2028_list);
-
+        /* only perform final cleanup if this is the last instance */
+        if (hybrid_tuner_report_instance_count(priv) == 1) {
                 kfree(priv->ctrl.fname);
-
                 free_firmware(priv);
-                kfree(priv);
-                fe->tuner_priv = NULL;
         }
 
+        if (priv)
+                hybrid_tuner_release_state(priv);
+
         mutex_unlock(&xc2028_list_mutex);
 
+        fe->tuner_priv = NULL;
+
         return 0;
 }
 
@@ -1150,7 +1148,7 @@ struct dvb_frontend *xc2028_attach(struct dvb_frontend *fe,
                                    struct xc2028_config *cfg)
 {
         struct xc2028_data *priv;
-        void               *video_dev;
+        int instance;
 
         if (debug)
                 printk(KERN_DEBUG "xc2028: Xcv2028/3028 init called!\n");
@@ -1163,48 +1161,40 @@ struct dvb_frontend *xc2028_attach(struct dvb_frontend *fe,
                 return NULL;
         }
 
-        video_dev = cfg->i2c_adap->algo_data;
-
-        if (debug)
-                printk(KERN_DEBUG "xc2028: video_dev =%p\n", video_dev);
-
         mutex_lock(&xc2028_list_mutex);
 
-        list_for_each_entry(priv, &xc2028_list, xc2028_list) {
-                if (&priv->i2c_props.adap->dev == &cfg->i2c_adap->dev) {
-                        video_dev = NULL;
-                        if (debug)
-                                printk(KERN_DEBUG "xc2028: reusing device\n");
-
-                        break;
-                }
-        }
-
-        if (video_dev) {
-                priv = kzalloc(sizeof(*priv), GFP_KERNEL);
-                if (priv == NULL) {
-                        mutex_unlock(&xc2028_list_mutex);
-                        return NULL;
-                }
-
-                priv->i2c_props.addr = cfg->i2c_addr;
-                priv->i2c_props.adap = cfg->i2c_adap;
-                priv->i2c_props.name = "xc2028";
-
-                priv->video_dev = video_dev;
+        instance = hybrid_tuner_request_state(struct xc2028_data, priv,
+                                              hybrid_tuner_instance_list,
+                                              cfg->i2c_adap, cfg->i2c_addr,
+                                              "xc2028");
+        switch (instance) {
+        case 0:
+                /* memory allocation failure */
+                goto fail;
+                break;
+        case 1:
+                /* new tuner instance */
                 priv->tuner_callback = cfg->callback;
                 priv->ctrl.max_len = 13;
 
                 mutex_init(&priv->lock);
 
-                list_add_tail(&priv->xc2028_list, &xc2028_list);
-        }
-
-        fe->tuner_priv = priv;
-        priv->count++;
+                /* analog side (tuner-core) uses i2c_adap->algo_data.
+                 * digital side is not guaranteed to have algo_data defined.
+                 *
+                 * digital side will always have fe->dvb defined.
+                 * analog side (tuner-core) doesn't (yet) define fe->dvb.
+                 */
+                priv->video_dev = ((fe->dvb) && (fe->dvb->priv)) ?
+                                   fe->dvb->priv : cfg->i2c_adap->algo_data;
 
-        if (debug)
-                printk(KERN_DEBUG "xc2028: usage count is %i\n", priv->count);
+                fe->tuner_priv = priv;
+                break;
+        case 2:
+                /* existing tuner instance */
+                fe->tuner_priv = priv;
+                break;
+        }
 
         memcpy(&fe->ops.tuner_ops, &xc2028_dvb_tuner_ops,
                sizeof(xc2028_dvb_tuner_ops));
@@ -1217,6 +1207,11 @@ struct dvb_frontend *xc2028_attach(struct dvb_frontend *fe,
         mutex_unlock(&xc2028_list_mutex);
 
         return fe;
+fail:
+        mutex_unlock(&xc2028_list_mutex);
+
+        xc2028_dvb_release(fe);
+        return NULL;
 }
 
 EXPORT_SYMBOL(xc2028_attach);