ALSA: isa: Fix error return code in snd_cmi8330_probe()

Zhen Lei · tiwai · commit 31028cbed26a · 2021-07-07T13:26:19.000+02:00
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: 43bcd97 ("[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>
diff --git a/sound/isa/cmi8330.c b/sound/isa/cmi8330.c
@@ -551,7 +551,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 */

Original file line number	Diff line number	Diff line change
`@@ -551,7 +551,7 @@ static int snd_cmi8330_probe(struct snd_card *card, int dev)`
`551`	`551`	`}`
`552`	`552`	`if (acard->sb->hardware != SB_HW_16) {`
`553`	`553`	`snd_printk(KERN_ERR PFX "SB16 not found during probe\n");`
`554`		`- return err;`
	`554`	`+ return -ENODEV;`
`555`	`555`	`}`
`556`	`556`
`557`	`557`	`snd_wss_out(acard->wss, CS4231_MISC_INFO, 0x40); /* switch on MODE2 */`