diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-11-22 20:33:12 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-11-22 20:33:12 +0000 |
| commit | cbe80def41f2f12b1b4f8b5c4eb048d50d842d6e (patch) | |
| tree | a7183a2c7caf5249bd355c55f5956a948defaac6 /sound/soc/codecs/wm8523.c | |
| parent | c7b642911ea0fa9168425757752f094a1255209a (diff) | |
| parent | eba19fdd818dfec3782ff095591e51c9bd617403 (diff) | |
| download | lwn-cbe80def41f2f12b1b4f8b5c4eb048d50d842d6e.tar.gz lwn-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.c | 1 |
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); |