From: Lars-Peter Clausen Date: Sat, 30 Apr 2011 20:28:20 +0000 (+0200) Subject: ASoC: JZ4740: Fix i2s shutdown X-Git-Tag: MMI-PSA29.97-13-9~19774^2~7 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=005967a1df80980acb47c72d758ec05059105492;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git ASoC: JZ4740: Fix i2s shutdown 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 Acked-by: Liam Girdwood Signed-off-by: Mark Brown --- diff --git a/sound/soc/jz4740/jz4740-i2s.c b/sound/soc/jz4740/jz4740-i2s.c index 419bf4f5534a..cd22a54b2f14 100644 --- a/sound/soc/jz4740/jz4740-i2s.c +++ b/sound/soc/jz4740/jz4740-i2s.c @@ -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);