summaryrefslogtreecommitdiffstats
path: root/sound/soc
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2011-05-03 19:07:45 +0100
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-05-03 19:07:45 +0100
commit65f7e32520fcc31c32d72e61198a4eb457656860 (patch)
treed5a1a2db39e2fd37f158aca2620141b0e22466d8 /sound/soc
parent6c45e126567eb9f96519ca97917ce317fcbe5218 (diff)
parent005967a1df80980acb47c72d758ec05059105492 (diff)
downloadlinux-65f7e32520fcc31c32d72e61198a4eb457656860.tar.bz2
Merge branch 'for-2.6.39' into for-2.6.40
Diffstat (limited to 'sound/soc')
-rw-r--r--sound/soc/jz4740/jz4740-i2s.c2
1 files changed, 1 insertions, 1 deletions
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);