]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
ALSA: ppc: fix error return code in snd_pmac_probe()
authorYang Yingliang <yangyingliang@huawei.com>
Wed, 16 Jun 2021 02:11:21 +0000 (10:11 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 20 Jul 2021 14:02:09 +0000 (16:02 +0200)
[ 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>
sound/ppc/powermac.c

index 9fb51ebafde1666ea6b3b3b34ca9617fc27f5ee3..8088f77d5a74baba9f926c3f5f79ad05f1a5161b 100644 (file)
@@ -76,7 +76,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: