diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-05-14 08:53:21 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-05-14 08:53:21 -0400 |
| commit | 407a0e18ecfbd7f58f49c307a657b63e6f32544d (patch) | |
| tree | d353e78d70fe3aa4aec631b1872af06b93f271a0 /sound/soc | |
| parent | c583eac39abfd45d1985f60c5c1727e585fadbdd (diff) | |
| parent | 2e0192f13c4428bb624838a9cc6713b6237bab3b (diff) | |
Merge remote-tracking branch 'asoc/fix/wm0010' into asoc-linus
Diffstat (limited to 'sound/soc')
| -rw-r--r-- | sound/soc/codecs/wm0010.c | 1 |
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) | |||
| 667 | /* On wm0010 only the CLKCTRL1 value is used */ | 667 | /* On wm0010 only the CLKCTRL1 value is used */ |
| 668 | pll_rec.clkctrl1 = wm0010->pll_clkctrl1; | 668 | pll_rec.clkctrl1 = wm0010->pll_clkctrl1; |
| 669 | 669 | ||
| 670 | ret = -ENOMEM; | ||
| 670 | len = pll_rec.length + 8; | 671 | len = pll_rec.length + 8; |
| 671 | out = kzalloc(len, GFP_KERNEL); | 672 | out = kzalloc(len, GFP_KERNEL); |
| 672 | if (!out) { | 673 | if (!out) { |