summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2013-05-14 16:53:21 +0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2013-05-14 16:53:21 +0400
commit407a0e18ecfbd7f58f49c307a657b63e6f32544d (patch)
treed353e78d70fe3aa4aec631b1872af06b93f271a0 /sound
parentc583eac39abfd45d1985f60c5c1727e585fadbdd (diff)
parent2e0192f13c4428bb624838a9cc6713b6237bab3b (diff)
downloadkernel-407a0e18ecfbd7f58f49c307a657b63e6f32544d.tar.gz
Merge remote-tracking branch 'asoc/fix/wm0010' into asoc-linus
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/codecs/wm0010.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/soc/codecs/wm0010.c b/sound/soc/codecs/wm0010.c
index 8df2b6e1a1a6..370af0cbcc9a 100644
--- a/sound/soc/codecs/wm0010.c
+++ b/sound/soc/codecs/wm0010.c
@@ -667,6 +667,7 @@ static int wm0010_boot(struct snd_soc_codec *codec)
/* On wm0010 only the CLKCTRL1 value is used */
pll_rec.clkctrl1 = wm0010->pll_clkctrl1;
+ ret = -ENOMEM;
len = pll_rec.length + 8;
out = kzalloc(len, GFP_KERNEL);
if (!out) {