projects
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e381a14
)
ALSA: ppc: fix error return code in snd_pmac_probe()
author
Yang Yingliang
<yangyingliang@huawei.com>
Wed, 16 Jun 2021 02:11:21 +0000
(10:11 +0800)
committer
Takashi Iwai
<tiwai@suse.de>
Wed, 16 Jun 2021 06:52:29 +0000
(08:52 +0200)
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>
sound/ppc/powermac.c
patch
|
blob
|
history
diff --git
a/sound/ppc/powermac.c
b/sound/ppc/powermac.c
index 1d2865c43d4b256de1d32ac65fca5eeae757720b..db414b61157e08234bf99d45ff7b19f538601a14 100644
(file)
--- 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: