Merge branch 'for-2.6.39' into for-2.6.40

mariux64 · May 3, 2011 · 65f7e32 · 65f7e32
2 parents 6c45e12 + 005967a
commit 65f7e32
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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);