]> git.openfabrics.org - ~shefty/rdma-dev.git/commitdiff
ASoC: wm0010: Initialise chip state before we register the interrupt
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 25 Sep 2012 18:04:25 +0000 (19:04 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 26 Sep 2012 12:54:00 +0000 (13:54 +0100)
The interrupt handler uses the chip state.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
sound/soc/codecs/wm0010.c

index 780110a15c977c638049ee1aadfc9eb7aaa7dd53..99afc003a084cabfc47511047247c0416da8931f 100644 (file)
@@ -810,7 +810,6 @@ static int wm0010_probe(struct snd_soc_codec *codec)
 
 static int __devinit wm0010_spi_probe(struct spi_device *spi)
 {
 
 static int __devinit wm0010_spi_probe(struct spi_device *spi)
 {
-       unsigned long flags;
        unsigned long gpio_flags;
        int ret;
        int trigger;
        unsigned long gpio_flags;
        int ret;
        int trigger;
@@ -877,6 +876,8 @@ static int __devinit wm0010_spi_probe(struct spi_device *spi)
                return -EINVAL;
        }
 
                return -EINVAL;
        }
 
+       wm0010->state = WM0010_POWER_OFF;
+
        irq = spi->irq;
        if (wm0010->pdata.irq_flags)
                trigger = wm0010->pdata.irq_flags;
        irq = spi->irq;
        if (wm0010->pdata.irq_flags)
                trigger = wm0010->pdata.irq_flags;
@@ -898,10 +899,6 @@ static int __devinit wm0010_spi_probe(struct spi_device *spi)
        else
                wm0010->board_max_spi_speed = 0;
 
        else
                wm0010->board_max_spi_speed = 0;
 
-       spin_lock_irqsave(&wm0010->irq_lock, flags);
-       wm0010->state = WM0010_POWER_OFF;
-       spin_unlock_irqrestore(&wm0010->irq_lock, flags);
-
        ret = snd_soc_register_codec(&spi->dev,
                                     &soc_codec_dev_wm0010, wm0010_dai,
                                     ARRAY_SIZE(wm0010_dai));
        ret = snd_soc_register_codec(&spi->dev,
                                     &soc_codec_dev_wm0010, wm0010_dai,
                                     ARRAY_SIZE(wm0010_dai));