diff options
| author |   Lars-Peter Clausen <lars@metafoo.de> | 2013-08-01 14:08:06 +0200 |
|---|---|---|
| committer |   Mark Brown <broonie@linaro.org> | 2013-08-01 14:12:59 +0100 |
| commit | 9356e9d51c80114fce2d7d8be99bce1d7e19d063 (patch) | |
| tree | b510ee65c095dd5ceecc218023d9270a5f7a9f7d /sound/soc/soc-dapm.c | |
| parent | ASoC: dapm: using freed pointer in dapm_kcontrol_add_widget() (diff) | |
| download | linux-dev-9356e9d51c80114fce2d7d8be99bce1d7e19d063.tar.xz linux-dev-9356e9d51c80114fce2d7d8be99bce1d7e19d063.zip | |
ASoC: dapm: Check return value of snd_soc_cnew()
snd_soc_cnew() can return NULL, so we should check the result before trying to
use it.
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'sound/soc/soc-dapm.c')
| -rw-r--r-- | sound/soc/soc-dapm.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index d74c3560d556..b4fae8717851 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -671,8 +671,10 @@ static int dapm_create_or_share_mixmux_kcontrol(struct snd_soc_dapm_widget *w, kcontrol = snd_soc_cnew(&w->kcontrol_news[kci], NULL, name, prefix); - kcontrol->private_free = dapm_kcontrol_free; kfree(long_name); + if (!kcontrol) + return -ENOMEM; + kcontrol->private_free = dapm_kcontrol_free; ret = dapm_kcontrol_data_alloc(w, kcontrol); if (ret) { |