diff options
| author | Takashi Iwai <tiwai@suse.de> | 2013-05-16 05:18:48 (GMT) |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2013-05-16 05:18:48 (GMT) |
| commit | 478e858b2fd4d0cbeef039befb7ef25b9c9bdc37 (patch) | |
| tree | 0914191dcd444982150c8bbb76d387b314ab1ea3 /sound/soc/codecs/wm0010.c | |
| parent | b1b9fbd0507aac4ddce14f513d52332f50be89dc (diff) | |
| parent | 407a0e18ecfbd7f58f49c307a657b63e6f32544d (diff) | |
| download | linux-478e858b2fd4d0cbeef039befb7ef25b9c9bdc37.tar.xz | |
Merge tag 'asoc-v3.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v3.10
A few small driver-specific fixes, none of them especially crippling.
Diffstat (limited to 'sound/soc/codecs/wm0010.c')
| -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 8df2b6e..370af0c 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) { |