summaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs/wm8523.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2010-11-22 21:33:12 +0100
committerMark Brown <broonie@opensource.wolfsonmicro.com>2010-11-22 21:33:12 +0100
commitcbe80def41f2f12b1b4f8b5c4eb048d50d842d6e (patch)
treea7183a2c7caf5249bd355c55f5956a948defaac6 /sound/soc/codecs/wm8523.c
parentASoC: Fix a memory leak in alc5623_i2c_probe error path (diff)
parentASoC: Restore WM8994 volatile and readable register operations (diff)
downloadlinux-cbe80def41f2f12b1b4f8b5c4eb048d50d842d6e.tar.xz
linux-cbe80def41f2f12b1b4f8b5c4eb048d50d842d6e.zip
Merge branch 'for-2.6.37' into for-2.6.38
Diffstat (limited to 'sound/soc/codecs/wm8523.c')
-rw-r--r--sound/soc/codecs/wm8523.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/sound/soc/codecs/wm8523.c b/sound/soc/codecs/wm8523.c
index 1bda09baa851..08f3189f4b3f 100644
--- a/sound/soc/codecs/wm8523.c
+++ b/sound/soc/codecs/wm8523.c
@@ -146,7 +146,6 @@ static int wm8523_startup(struct snd_pcm_substream *substream,
return -EINVAL;
}
- return 0;
snd_pcm_hw_constraint_list(substream->runtime, 0,
SNDRV_PCM_HW_PARAM_RATE,
&wm8523->rate_constraint);