Merge branch 'for-2.6.39' into for-2.6.40

65f7e325 · Mark Brown · 6c45e126 · 005967a1 · 65f7e325
Commit 65f7e325 authored May 03, 2011 by Mark Brown
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

sound/soc/jz4740/jz4740-i2s.c sound/soc/jz4740/jz4740-i2s.c +1 -1

No files found.
--- 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);