Browse Source

Merge branch 'for-2.6.39' into for-2.6.40

Mark Brown 14 years ago
parent
commit
65f7e32520
1 changed files with 1 additions and 1 deletions
  1. 1 1
      sound/soc/jz4740/jz4740-i2s.c

+ 1 - 1
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);