Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e2d1a42e authored by Linus Walleij's avatar Linus Walleij Committed by Greg Kroah-Hartman
Browse files

ASoC: dapm: fix some pointer error handling 




[ Upstream commit 639467c8f26d834c934215e8b59129ce442475fe ]

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: default avatarDan Carpenter <dan.carpenter@oracle.com>
Fixes: 66feeec93221 ("RFC: ASoC: dapm: handle probe deferrals")
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
Signed-off-by: default avatarSasha Levin <alexander.levin@verizon.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4302bc4f

sound/soc/soc-dapm.c

+20 −0
Original line number Diff line number Diff line
@@ -3843,6 +3843,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);
@@ -3862,6 +3872,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);