diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-12 12:41:30 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-12 12:41:30 -0700 |
| commit | ca1376d10810bc2c20c8d0821a9ee04ca2507c01 (patch) | |
| tree | 5575a8dcce6d00ef702257cdb7027f603c4df3f7 /sound/soc/jz4740/jz4740-i2s.c | |
| parent | 0c5e1577f1108e88475ca7b7ca75c411460173e1 (diff) | |
| parent | 61bf35b9a3eab961ee1249467d9b2ac11d3c34c1 (diff) | |
| download | lwn-ca1376d10810bc2c20c8d0821a9ee04ca2507c01.tar.gz lwn-ca1376d10810bc2c20c8d0821a9ee04ca2507c01.zip | |
Merge branch 'fix/asoc' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
* 'fix/asoc' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
ASoC: WM8903: Fix Digital Capture Volume range
ASoC: UDA134x: Remove POWER_OFF_ON_STANDBY define.
ASoC: SSM2602: Fix reg_cache_size
ASoC: SSM2602: Fix 'Mic Boost2' control
ASoC: SSM2602: Properly annotate i2c probe and remove functions
ASoC: sst_platform: add hw_free callback to fix resource leak
ASoC: Don't crash on PM operations
ASoC: JZ4740: Fix i2s shutdown
Diffstat (limited to 'sound/soc/jz4740/jz4740-i2s.c')
| -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, 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); |