Commit 75dc1942 authored Jun 16, 2021 by Yang Yingliang Committed by Greg Kroah-Hartman Jul 20, 2021

ALSA: ppc: fix error return code in snd_pmac_probe()



[ 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 <hulkci@huawei.com>
Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
Link: https://lore.kernel.org/r/20210616021121.1991502-1-yangyingliang@huawei.com


Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent 8e1b6d96

sound/ppc/powermac.c

+5 −1

Original line number	Diff line number	Diff line
		@@ -77,7 +77,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: