summaryrefslogtreecommitdiff
path: root/sound/ppc
diff options
context:
space:
mode:
authorYang Yingliang <yangyingliang@huawei.com>2021-06-16 05:11:21 +0300
committerTakashi Iwai <tiwai@suse.de>2021-06-16 09:52:29 +0300
commit80b9c1be567c3c6bbe0d4b290af578e630485b5d (patch)
treeb74f39442f2c86436678ee639338e3b33146baa9 /sound/ppc
parente381a14c3e3a4e90e293d4eaa5a3ab8ae98b9973 (diff)
downloadlinux-80b9c1be567c3c6bbe0d4b290af578e630485b5d.tar.xz
ALSA: ppc: fix error return code in snd_pmac_probe()
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>
Diffstat (limited to 'sound/ppc')
-rw-r--r--sound/ppc/powermac.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/sound/ppc/powermac.c b/sound/ppc/powermac.c
index 1d2865c43d4b..db414b61157e 100644
--- a/sound/ppc/powermac.c
+++ b/sound/ppc/powermac.c
@@ -79,7 +79,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: