From: Yang Yingliang <yangyingli...@huawei.com>

[ 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 <hul...@huawei.com>
Signed-off-by: Yang Yingliang <yangyingli...@huawei.com>
Link: 
https://lore.kernel.org/r/20210616021121.1991502-1-yangyingli...@huawei.com
Signed-off-by: Takashi Iwai <ti...@suse.de>
Signed-off-by: Sasha Levin <sas...@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 96ef55082bf9..b135d114ce89 100644
--- a/sound/ppc/powermac.c
+++ b/sound/ppc/powermac.c
@@ -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:
-- 
2.30.2

Reply via email to