| Message ID | 20210616021121.1991502-1-yangyingliang@huawei.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 80b9c1be567c3c6bbe0d4b290af578e630485b5d |
| Headers | show |
| Series | [-next] ALSA: ppc: fix error return code in snd_pmac_probe() | expand |
On Wed, 16 Jun 2021 04:11:21 +0200, Yang Yingliang wrote: > > 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> Thanks, applied. Takashi
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:
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> --- sound/ppc/powermac.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)