V4L/DVB (10162): tuner-simple: Fix tuner type set message

[pandora-kernel.git] / drivers / media / common / tuners / tuner-simple.c

diff --git a/drivers/media/common/tuners/tuner-simple.c b/drivers/media/common/tuners/tuner-simple.c
index 2a1aac1..1a21191 100644 (file)
--- a/drivers/media/common/tuners/tuner-simple.c
+++ b/drivers/media/common/tuners/tuner-simple.c
@@ -493,6 +493,7 @@ static int simple_radio_bandswitch(struct dvb_frontend *fe, u8 *buffer)
        case TUNER_PHILIPS_FM1216ME_MK3:
        case TUNER_PHILIPS_FM1236_MK3:
        case TUNER_PHILIPS_FMD1216ME_MK3:
+       case TUNER_PHILIPS_FMD1216MEX_MK3:
        case TUNER_LG_NTSC_TAPE:
        case TUNER_PHILIPS_FM1256_IH3:
        case TUNER_TCL_MF02GIP_5N:
@@ -767,6 +768,7 @@ static void simple_set_dvb(struct dvb_frontend *fe, u8 *buf,
 
        switch (priv->type) {
        case TUNER_PHILIPS_FMD1216ME_MK3:
+       case TUNER_PHILIPS_FMD1216MEX_MK3:
                if (params->u.ofdm.bandwidth == BANDWIDTH_8_MHZ &&
                    params->frequency >= 158870000)
                        buf[3] |= 0x08;
@@ -1057,7 +1059,12 @@ struct dvb_frontend *simple_tuner_attach(struct dvb_frontend *fe,
        memcpy(&fe->ops.tuner_ops, &simple_tuner_ops,
               sizeof(struct dvb_tuner_ops));
 
-       tuner_info("type set to %d (%s)\n", type, priv->tun->name);
+       if (type != priv->type)
+               tuner_warn("couldn't set type to %d. Using %d (%s) instead\n",
+                           type, priv->type, priv->tun->name);
+       else
+               tuner_info("type set to %d (%s)\n",
+                          priv->type, priv->tun->name);
 
        if ((debug) || ((atv_input[priv->nr] > 0) ||
                        (dtv_input[priv->nr] > 0))) {