]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
ALSA: isa: Fix error return code in snd_cmi8330_probe()
authorZhen Lei <thunder.leizhen@huawei.com>
Wed, 7 Jul 2021 07:40:51 +0000 (15:40 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 20 Jul 2021 14:22:43 +0000 (16:22 +0200)
[ 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

index dfedfd85f205460095ad09b1f0086c8f25925ea9..463906882b95c610461c5bc03773861161d78420 100644 (file)
@@ -564,7 +564,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 */