diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-05-03 14:07:45 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-05-03 14:07:45 -0400 |
| commit | 65f7e32520fcc31c32d72e61198a4eb457656860 (patch) | |
| tree | d5a1a2db39e2fd37f158aca2620141b0e22466d8 | |
| parent | 6c45e126567eb9f96519ca97917ce317fcbe5218 (diff) | |
| parent | 005967a1df80980acb47c72d758ec05059105492 (diff) | |
Merge branch 'for-2.6.39' into for-2.6.40
| -rw-r--r-- | sound/soc/jz4740/jz4740-i2s.c | 2 |
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, | |||
| 133 | struct jz4740_i2s *i2s = snd_soc_dai_get_drvdata(dai); | 133 | struct jz4740_i2s *i2s = snd_soc_dai_get_drvdata(dai); |
| 134 | uint32_t conf; | 134 | uint32_t conf; |
| 135 | 135 | ||
| 136 | if (!dai->active) | 136 | if (dai->active) |
| 137 | return; | 137 | return; |
| 138 | 138 | ||
| 139 | conf = jz4740_i2s_read(i2s, JZ_REG_AIC_CONF); | 139 | conf = jz4740_i2s_read(i2s, JZ_REG_AIC_CONF); |