| From 60251c5d4de214357a69562fe884a432437b087f Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Wed, 16 Jun 2021 10:11:21 +0800 |
| Subject: ALSA: ppc: fix error return code in snd_pmac_probe() |
| |
| From: Yang Yingliang <yangyingliang@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 <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 | 6 +++++- |
| 1 file changed, 5 insertions(+), 1 deletion(-) |
| |
| diff --git a/sound/ppc/powermac.c b/sound/ppc/powermac.c |
| index 9fb51ebafde1..8088f77d5a74 100644 |
| --- a/sound/ppc/powermac.c |
| +++ b/sound/ppc/powermac.c |
| @@ -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: |
| -- |
| 2.30.2 |
| |