| From b2dea82e028454910ebc6ce6fc34cf1d112cf1a2 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Wed, 7 Jul 2021 15:40:51 +0800 |
| Subject: ALSA: isa: Fix error return code in snd_cmi8330_probe() |
| |
| From: Zhen Lei <thunder.leizhen@huawei.com> |
| |
| [ Upstream commit 31028cbed26a8afa25533a10425ffa2ab794c76c ] |
| |
| When 'SB_HW_16' check fails, the error code -ENODEV instead of 0 should be |
| returned, which is the same as that returned when 'WSS_HW_CMI8330' check |
| fails. |
| |
| Fixes: 43bcd973d6d0 ("[ALSA] Add snd_card_set_generic_dev() call to ISA drivers") |
| Reported-by: Hulk Robot <hulkci@huawei.com> |
| Signed-off-by: Zhen Lei <thunder.leizhen@huawei.com> |
| Link: https://lore.kernel.org/r/20210707074051.2663-1-thunder.leizhen@huawei.com |
| Signed-off-by: Takashi Iwai <tiwai@suse.de> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| sound/isa/cmi8330.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/sound/isa/cmi8330.c b/sound/isa/cmi8330.c |
| index bc112df10fc5..d1ac9fc99491 100644 |
| --- a/sound/isa/cmi8330.c |
| +++ b/sound/isa/cmi8330.c |
| @@ -547,7 +547,7 @@ static int snd_cmi8330_probe(struct snd_card *card, int dev) |
| } |
| if (acard->sb->hardware != SB_HW_16) { |
| snd_printk(KERN_ERR PFX "SB16 not found during probe\n"); |
| - return err; |
| + return -ENODEV; |
| } |
| |
| snd_wss_out(acard->wss, CS4231_MISC_INFO, 0x40); /* switch on MODE2 */ |
| -- |
| 2.30.2 |
| |
