From patchwork Mon Jul 19 14:53:28 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 479995 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp4269261jao; Mon, 19 Jul 2021 09:09:48 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxjnbf6PeR2ZMv8JFOjOoukqzSOt5uOENa+I/d0TAiWdv6kXSc0oTvROqKFPr+OsJMKT7Mr X-Received: by 2002:a17:906:4b43:: with SMTP id j3mr14098692ejv.524.1626710988716; Mon, 19 Jul 2021 09:09:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626710988; cv=none; d=google.com; s=arc-20160816; b=hWSYWj+i14In7/Vc+ET6RjCv5bdFCFgGospCz04JMtMEfLVX68d2B+uGTvnuu4Nxv3 wFWuuK67GhEQ20UuD6WmBeZCIUkMYRlxVRNhAj+GOW+5Jom9CoUAw54EEJSvRyfsJ0Wu SYP05A3cZhN+ykTRghotlYfBabx9SsumqtuxSfdqZYtS6WQ7ZYTAOUqXxiBrmAoNTUva /OL9qMajMRtTs0x0Ew3jgCcv7fBViCv6Uk2eSZLE93l3Y6UZuqoLKbjWoiIjUTZFG0OO yoEm+QqxeOIDUaNWV6Nlnl7B9M8wpMBa5GrbfWYuMzbZcPGWxP2PBMbD1NbokCYPgi/v 796Q== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=QJ9zDZP11sDsJlrPGYw9rriSaGQVKpX5M+1kStkX0T4=; b=KMxb4ejTFtdDF+c3VxKxuBXFyziZv+WsS+adIFL+zKp7RHDGQkTki0QznVyQZO9dnH 0aWju8Ta6e6pD5g8zPdMtPBPRpK/ulEvHRcP76HZVcLnBt/fzNzqyBerGUE16/Hfqqff nfO8uxykjgNRzVh6aDqTVpk/j8x7EoZY2ShboAT54o3XyFsdeGP3TSinfuiURc3bWV1t iByJDJEfQYEqj0VYZBWbFHw4wGQFKb6rxIYbSvQEJ6FAbNYaeaUetKXEA1bjPfoTok4j chWJe2ZRzOFAB5DQvEP3xeNqvS8Oj8ae/vXlevz0Vfdx2OhAnX/Pw1mtpotWAo1gRL25 vpSA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=Znr9dj3B; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id la14si22045543ejc.142.2021.07.19.09.09.48; Mon, 19 Jul 2021 09:09:48 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=Znr9dj3B; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1349291AbhGSP00 (ORCPT + 12 others); Mon, 19 Jul 2021 11:26:26 -0400 Received: from mail.kernel.org ([198.145.29.99]:40604 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1348084AbhGSPYe (ORCPT ); Mon, 19 Jul 2021 11:24:34 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id A201B613F5; Mon, 19 Jul 2021 16:00:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626710454; bh=xSBtEGB60n4H9EAEjCxhlr3ccB8h/4mssLV8fVgEEwY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Znr9dj3BsZaZkVQcrn1X9kSgUWWt5B9Br21esMvKrx2/BlenPJSheuueIiGYQrUwq amcDNytyr0KQKTRZ1LvCZxq7U7Z/DHNIC/djmmNGxk2Anz6v7rbAYEJ7KCQ10e2HAf UE19iKMmzkEV/XIj70WFrhPQ5mOSiLXUCpWm9TJA= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Hulk Robot , Zhen Lei , Takashi Iwai , Sasha Levin Subject: [PATCH 5.10 179/243] ALSA: isa: Fix error return code in snd_cmi8330_probe() Date: Mon, 19 Jul 2021 16:53:28 +0200 Message-Id: <20210719144946.685052702@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210719144940.904087935@linuxfoundation.org> References: <20210719144940.904087935@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Zhen Lei [ 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 Signed-off-by: Zhen Lei Link: https://lore.kernel.org/r/20210707074051.2663-1-thunder.leizhen@huawei.com Signed-off-by: Takashi Iwai Signed-off-by: Sasha Levin --- sound/isa/cmi8330.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.30.2 diff --git a/sound/isa/cmi8330.c b/sound/isa/cmi8330.c index 4669eb0cc8ce..5434cc90db1d 100644 --- a/sound/isa/cmi8330.c +++ b/sound/isa/cmi8330.c @@ -548,7 +548,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 */