diff options
| author | Mark Brown | 2017-02-19 17:35:33 +0100 |
|---|---|---|
| committer | Mark Brown | 2017-02-19 17:35:33 +0100 |
| commit | 19532a24773a7a7a988ffbab805b05ad7e564115 (patch) | |
| tree | 2ec364a2d487844b28e05860c127ce0d97b4e344 /sound/soc/soc-topology.c | |
| parent | Merge tag 'asoc-fix-v4.10-rc3' into asoc-linus (diff) | |
| parent | ASoC: dapm: fix some pointer error handling (diff) | |
| download | kernel-qcow2-linux-19532a24773a7a7a988ffbab805b05ad7e564115.tar.gz kernel-qcow2-linux-19532a24773a7a7a988ffbab805b05ad7e564115.tar.xz kernel-qcow2-linux-19532a24773a7a7a988ffbab805b05ad7e564115.zip | |
Merge remote-tracking branch 'asoc/fix/dapm' into asoc-linus
Diffstat (limited to 'sound/soc/soc-topology.c')
| -rw-r--r-- | sound/soc/soc-topology.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/sound/soc/soc-topology.c b/sound/soc/soc-topology.c index fbfb1fab88d5..01e8bb0910b2 100644 --- a/sound/soc/soc-topology.c +++ b/sound/soc/soc-topology.c @@ -1555,6 +1555,15 @@ widget: widget = snd_soc_dapm_new_control(dapm, &template); else widget = snd_soc_dapm_new_control_unlocked(dapm, &template); + if (IS_ERR(widget)) { + ret = PTR_ERR(widget); + /* Do not nag about probe deferrals */ + if (ret != -EPROBE_DEFER) + dev_err(tplg->dev, + "ASoC: failed to create widget %s controls (%d)\n", + w->name, ret); + goto hdr_err; + } if (widget == NULL) { dev_err(tplg->dev, "ASoC: failed to create widget %s controls\n", w->name); |