Received: by 2002:a05:6a10:f3d0:0:0:0:0 with SMTP id a16csp5324274pxv; Wed, 7 Jul 2021 00:42:29 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyia0j36G9DyNKUvW2jq2eXX0QWZeTp9kVrSqEe9EzyJqjf7EbF7XRuvmB6aD7BYWQECo8d X-Received: by 2002:a92:a80e:: with SMTP id o14mr17362457ilh.81.1625643749443; Wed, 07 Jul 2021 00:42:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625643749; cv=none; d=google.com; s=arc-20160816; b=nglFAPZyF8iG4y+OIhvbfr4ZB8XWKnox9F5uT0CdamxsAX5zR3+BIWbczbqPS4fDuW CJUdIZ/uzzsmmddwGUwmLns43wnN8rkbg4r5XE98onqhfdBIBpqcgBSzRCbnZncj2KXb d0Q4wSL8oNHPwdEA8tJIVW19hfO7i+hCPHMigPk6iN+GCzp5QTjkVCu6wGQP70BVn7jf mQ2PWkj0BNE3dVPhAyL6UJKOKUXU5SSJTci0sVwVJ/ECogupfARfNSxg5Dzk2rOVM56n lLkEH+xxPjmO5aPLfn9gLkSMlDv1x/HhxSfW2FCigYdAlnia/YeVg8Vis8NHK+1mJYGT MWhw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=mAv4rQw9BuS++06mU+PXDQ+CDuraxW20kxxdoKPv7Xc=; b=dSH+FpAph4JLp3dLr+9C7y0uZaMuWUDTZMxe56xL5ym0zXvI4Jj+Svmk8dVM44jWxp xR6+lk+J9dY5SioZnUoXLtCWFSaIm7W3FliQM6qJpY0WfJYv1tqCUAXoWwgX2qCAfOmN vgedm0vBPq2NWKVQy9twlC7uN8Bpi+TpTBGlfSgkPtoZ+wPE4bYdH5XaysFzcKbegsZR GY86pKVvOWfXkU54oib1clvg3j+P+2t6/ubg7MCvLtmzjM1piEIUGcrub6xzDR/YBOHC 1Oxa906NNFz9yG6PndnK+VlQFZ+d8blbc2Rtea3egpQkGU1Exn1MwRdBU/NTYC4i4ZyE Yk8A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=huawei.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id d198si19387818jac.70.2021.07.07.00.42.17; Wed, 07 Jul 2021 00:42:29 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230405AbhGGHo1 (ORCPT + 99 others); Wed, 7 Jul 2021 03:44:27 -0400 Received: from szxga02-in.huawei.com ([45.249.212.188]:6440 "EHLO szxga02-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230409AbhGGHo0 (ORCPT ); Wed, 7 Jul 2021 03:44:26 -0400 Received: from dggemv704-chm.china.huawei.com (unknown [172.30.72.54]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4GKWVt4VL4z78hc; Wed, 7 Jul 2021 15:38:14 +0800 (CST) Received: from dggpemm500006.china.huawei.com (7.185.36.236) by dggemv704-chm.china.huawei.com (10.3.19.47) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.2; Wed, 7 Jul 2021 15:41:38 +0800 Received: from thunder-town.china.huawei.com (10.174.179.0) by dggpemm500006.china.huawei.com (7.185.36.236) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.2; Wed, 7 Jul 2021 15:41:38 +0800 From: Zhen Lei To: Jaroslav Kysela , Takashi Iwai , alsa-devel , linux-kernel CC: Zhen Lei Subject: [PATCH 1/1] ALSA: isa: Fix error return code in snd_cmi8330_probe() Date: Wed, 7 Jul 2021 15:40:51 +0800 Message-ID: <20210707074051.2663-1-thunder.leizhen@huawei.com> X-Mailer: git-send-email 2.26.0.windows.1 MIME-Version: 1.0 Content-Transfer-Encoding: 7BIT Content-Type: text/plain; charset=US-ASCII X-Originating-IP: [10.174.179.0] X-ClientProxiedBy: dggems703-chm.china.huawei.com (10.3.19.180) To dggpemm500006.china.huawei.com (7.185.36.236) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 Signed-off-by: Zhen Lei --- 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 6c59a3eec59b..ef6d0a20efd8 100644 --- 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 */ -- 2.25.1