[PATCH AUTOSEL 4.14 20/33] ALSA: ppc: fix error return code in snd_pmac_probe()
From: Sasha Levin <sashal@kernel.org>
Date: 2021-07-10 02:39:37
Also in:
alsa-devel, lkml, stable
Subsystem:
sound, the rest · Maintainers:
Jaroslav Kysela, Takashi Iwai, Linus Torvalds
From: Yang Yingliang <redacted> [ Upstream commit 80b9c1be567c3c6bbe0d4b290af578e630485b5d ] If snd_pmac_tumbler_init() or snd_pmac_tumbler_post_init() fails, snd_pmac_probe() need return error code. Reported-by: Hulk Robot <redacted> Signed-off-by: Yang Yingliang <redacted> Link: https://lore.kernel.org/r/20210616021121.1991502-1-yangyingliang@huawei.com (local) Signed-off-by: Takashi Iwai <redacted> Signed-off-by: Sasha Levin <sashal@kernel.org> --- sound/ppc/powermac.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/sound/ppc/powermac.c b/sound/ppc/powermac.c
index 33c6be9fb388..7c70ba5e2540 100644
--- a/sound/ppc/powermac.c
+++ b/sound/ppc/powermac.c@@ -90,7 +90,11 @@ static int snd_pmac_probe(struct platform_device *devptr) sprintf(card->shortname, "PowerMac %s", name_ext); sprintf(card->longname, "%s (Dev %d) Sub-frame %d", card->shortname, chip->device_id, chip->subframe); - if ( snd_pmac_tumbler_init(chip) < 0 || snd_pmac_tumbler_post_init() < 0) + err = snd_pmac_tumbler_init(chip); + if (err < 0) + goto __error; + err = snd_pmac_tumbler_post_init(); + if (err < 0) goto __error; break; case PMAC_AWACS:
--
2.30.2