| commit | 65f7e32520fcc31c32d72e61198a4eb457656860 | [log] [tgz] |
|---|---|---|
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | Tue May 03 19:07:45 2011 +0100 |
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | Tue May 03 19:07:45 2011 +0100 |
| tree | d5a1a2db39e2fd37f158aca2620141b0e22466d8 | |
| parent | 6c45e126567eb9f96519ca97917ce317fcbe5218 [diff] | |
| parent | 005967a1df80980acb47c72d758ec05059105492 [diff] |
Merge branch 'for-2.6.39' into for-2.6.40
diff --git a/sound/soc/jz4740/jz4740-i2s.c b/sound/soc/jz4740/jz4740-i2s.c index 419bf4f..cd22a54 100644 --- a/sound/soc/jz4740/jz4740-i2s.c +++ b/sound/soc/jz4740/jz4740-i2s.c
@@ -133,7 +133,7 @@ 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);