Merge remote-tracking branches 'asoc/topic/max98090', 'asoc/topic/rockchip', 'asoc...

[karo-tx-linux.git] / sound / soc / codecs / max98090.c

diff --git a/sound/soc/codecs/max98090.c b/sound/soc/codecs/max98090.c
index 7e111865946a63c47d81f80a79387cf65b2b0c01..d519294f57c79c289784f9a71bb43d7bf51dc7e9 100644 (file)
--- a/sound/soc/codecs/max98090.c
+++ b/sound/soc/codecs/max98090.c
@@ -2159,12 +2159,16 @@ static void max98090_jack_work(struct work_struct *work)
 
 static irqreturn_t max98090_interrupt(int irq, void *data)
 {
-       struct snd_soc_codec *codec = data;
-       struct max98090_priv *max98090 = snd_soc_codec_get_drvdata(codec);
+       struct max98090_priv *max98090 = data;
+       struct snd_soc_codec *codec = max98090->codec;
        int ret;
        unsigned int mask;
        unsigned int active;
 
+       /* Treat interrupt before codec is initialized as spurious */
+       if (codec == NULL)
+               return IRQ_NONE;
+
        dev_dbg(codec->dev, "***** max98090_interrupt *****\n");
 
        ret = regmap_read(max98090->regmap, M98090_REG_INTERRUPT_S, &mask);
@@ -2329,7 +2333,6 @@ static int max98090_probe(struct snd_soc_codec *codec)
        max98090->lin_state = 0;
        max98090->pa1en = 0;
        max98090->pa2en = 0;
-       max98090->extmic_mux = 0;
 
        ret = snd_soc_read(codec, M98090_REG_REVISION_ID);
        if (ret < 0) {
@@ -2367,17 +2370,6 @@ static int max98090_probe(struct snd_soc_codec *codec)
        snd_soc_write(codec, M98090_REG_JACK_DETECT,
                M98090_JDETEN_MASK | M98090_JDEB_25MS);
 
-       /* Register for interrupts */
-       dev_dbg(codec->dev, "irq = %d\n", max98090->irq);
-
-       ret = devm_request_threaded_irq(codec->dev, max98090->irq, NULL,
-               max98090_interrupt, IRQF_TRIGGER_FALLING | IRQF_ONESHOT,
-               "max98090_interrupt", codec);
-       if (ret < 0) {
-               dev_err(codec->dev, "request_irq failed: %d\n",
-                       ret);
-       }
-
        /*
         * Clear any old interrupts.
         * An old interrupt ocurring prior to installing the ISR
@@ -2417,6 +2409,7 @@ static int max98090_remove(struct snd_soc_codec *codec)
        cancel_delayed_work_sync(&max98090->pll_det_enable_work);
        cancel_work_sync(&max98090->pll_det_disable_work);
        cancel_work_sync(&max98090->pll_work);
+       max98090->codec = NULL;
 
        return 0;
 }
@@ -2469,7 +2462,6 @@ static int max98090_i2c_probe(struct i2c_client *i2c,
        max98090->devtype = driver_data;
        i2c_set_clientdata(i2c, max98090);
        max98090->pdata = i2c->dev.platform_data;
-       max98090->irq = i2c->irq;
 
        max98090->regmap = devm_regmap_init_i2c(i2c, &max98090_regmap);
        if (IS_ERR(max98090->regmap)) {
@@ -2478,6 +2470,15 @@ static int max98090_i2c_probe(struct i2c_client *i2c,
                goto err_enable;
        }
 
+       ret = devm_request_threaded_irq(&i2c->dev, i2c->irq, NULL,
+               max98090_interrupt, IRQF_TRIGGER_FALLING | IRQF_ONESHOT,
+               "max98090_interrupt", max98090);
+       if (ret < 0) {
+               dev_err(&i2c->dev, "request_irq failed: %d\n",
+                       ret);
+               return ret;
+       }
+
        ret = snd_soc_register_codec(&i2c->dev,
                        &soc_codec_dev_max98090, max98090_dai,
                        ARRAY_SIZE(max98090_dai));