ASoC: dapm: fix some pointer error handling
commit 66feeec9322132689d42723df2537d60f96f8e44 "RFC: ASoC: dapm: handle probe deferrals" forgot a to update some two sites where the call was used. The static codechecks quickly found them. Reported-by: Dan Carpenter <dan.carpenter@oracle.com> Fixes: 66feeec93221 ("RFC: ASoC: dapm: handle probe deferrals") Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
parent
37e1df8c95
commit
639467c8f2
1 changed files with 20 additions and 0 deletions
|
@ -3935,6 +3935,16 @@ int snd_soc_dapm_new_dai_widgets(struct snd_soc_dapm_context *dapm,
|
|||
template.name);
|
||||
|
||||
w = snd_soc_dapm_new_control_unlocked(dapm, &template);
|
||||
if (IS_ERR(w)) {
|
||||
int ret = PTR_ERR(w);
|
||||
|
||||
/* Do not nag about probe deferrals */
|
||||
if (ret != -EPROBE_DEFER)
|
||||
dev_err(dapm->dev,
|
||||
"ASoC: Failed to create %s widget (%d)\n",
|
||||
dai->driver->playback.stream_name, ret);
|
||||
return ret;
|
||||
}
|
||||
if (!w) {
|
||||
dev_err(dapm->dev, "ASoC: Failed to create %s widget\n",
|
||||
dai->driver->playback.stream_name);
|
||||
|
@ -3954,6 +3964,16 @@ int snd_soc_dapm_new_dai_widgets(struct snd_soc_dapm_context *dapm,
|
|||
template.name);
|
||||
|
||||
w = snd_soc_dapm_new_control_unlocked(dapm, &template);
|
||||
if (IS_ERR(w)) {
|
||||
int ret = PTR_ERR(w);
|
||||
|
||||
/* Do not nag about probe deferrals */
|
||||
if (ret != -EPROBE_DEFER)
|
||||
dev_err(dapm->dev,
|
||||
"ASoC: Failed to create %s widget (%d)\n",
|
||||
dai->driver->playback.stream_name, ret);
|
||||
return ret;
|
||||
}
|
||||
if (!w) {
|
||||
dev_err(dapm->dev, "ASoC: Failed to create %s widget\n",
|
||||
dai->driver->capture.stream_name);
|
||||
|
|
Loading…
Reference in a new issue