Merge tag 'firewire-updates' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee139...

[karo-tx-linux.git] / drivers / media / tuners / xc5000.c

diff --git a/drivers/media/tuners/xc5000.c b/drivers/media/tuners/xc5000.c
index 803a0e63d47eef2ee40e1fb1ce7fbec21cd7d9ab..2a039de8ab9ae822917ac65c36b40002897b998e 100644 (file)
--- a/drivers/media/tuners/xc5000.c
+++ b/drivers/media/tuners/xc5000.c
@@ -62,6 +62,7 @@ struct xc5000_priv {
        unsigned int mode;
        u8  rf_mode;
        u8  radio_input;
+       u16  output_amp;
 
        int chip_id;
        u16 pll_register_no;
@@ -744,7 +745,9 @@ static int xc5000_tune_digital(struct dvb_frontend *fe)
                return -EIO;
        }
 
-       xc_write_reg(priv, XREG_OUTPUT_AMP, 0x8a);
+       dprintk(1, "%s() setting OUTPUT_AMP to 0x%x\n",
+               __func__, priv->output_amp);
+       xc_write_reg(priv, XREG_OUTPUT_AMP, priv->output_amp);
 
        xc_tune_channel(priv, priv->freq_hz, XC_TUNE_DIGITAL);
 
@@ -1333,8 +1336,7 @@ static int xc5000_release(struct dvb_frontend *fe)
 
        if (priv) {
                cancel_delayed_work(&priv->timer_sleep);
-               if (priv->firmware)
-                       release_firmware(priv->firmware);
+               release_firmware(priv->firmware);
                hybrid_tuner_release_state(priv);
        }
 
@@ -1358,6 +1360,9 @@ static int xc5000_set_config(struct dvb_frontend *fe, void *priv_cfg)
        if (p->radio_input)
                priv->radio_input = p->radio_input;
 
+       if (p->output_amp)
+               priv->output_amp = p->output_amp;
+
        return 0;
 }
 
@@ -1438,6 +1443,12 @@ struct dvb_frontend *xc5000_attach(struct dvb_frontend *fe,
                   it can be overridden if this is a hybrid driver */
                priv->chip_id = (cfg->chip_id) ? cfg->chip_id : 0;
 
+       /* don't override output_amp if it's already been set
+          unless explicitly specified */
+       if ((priv->output_amp == 0) || (cfg->output_amp))
+               /* use default output_amp value if none specified */
+               priv->output_amp = (cfg->output_amp) ? cfg->output_amp : 0x8a;
+
        /* Check if firmware has been loaded. It is possible that another
           instance of the driver has loaded the firmware.
         */