git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
ASoC: Fix multi-component mismerge in WM8523
[pandora-kernel.git]
/
sound
/
soc
/
codecs
/
wm8523.c
diff --git
a/sound/soc/codecs/wm8523.c
b/sound/soc/codecs/wm8523.c
index
712ef7c
..
9a433a5
100644
(file)
--- 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);