]> Pileus Git - ~andy/linux/commitdiff
ASoC: JZ4740: Fix i2s shutdown
authorLars-Peter Clausen <lars@metafoo.de>
Sat, 30 Apr 2011 20:28:20 +0000 (22:28 +0200)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 3 May 2011 17:48:24 +0000 (18:48 +0100)
The i2s shutdown callback has the check whether it should be disabled reversed.
Currently it is disabled if another stream is still active, but kept enabled if
the last stream is closed. This patch fixes it.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
sound/soc/jz4740/jz4740-i2s.c

index 419bf4f5534a6c082f8e5b5aa7a1a9ce3e43bcf7..cd22a54b2f14b3cd408d64acbbc519786320f573 100644 (file)
@@ -133,7 +133,7 @@ static void jz4740_i2s_shutdown(struct snd_pcm_substream *substream,
        struct jz4740_i2s *i2s = snd_soc_dai_get_drvdata(dai);
        uint32_t conf;
 
-       if (!dai->active)
+       if (dai->active)
                return;
 
        conf = jz4740_i2s_read(i2s, JZ_REG_AIC_CONF);