From patchwork Mon Jul 19 14:52:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 479885 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp4220958jao; Mon, 19 Jul 2021 08:16:05 -0700 (PDT) X-Google-Smtp-Source: ABdhPJygtotweSqzWFNizKpYRmhHaA+WjpDrpcXY0ETlPWa0BBqNcJjAiEGnEyVACfn8LwY+eSvD X-Received: by 2002:a05:6638:3824:: with SMTP id i36mr10371039jav.11.1626707765370; Mon, 19 Jul 2021 08:16:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626707765; cv=none; d=google.com; s=arc-20160816; b=KcjP5z8lY90u6IaxjjoHviCJcrE4Mp9pwMimGVc2k1g1FmvoIZI8kWOAoKJuPYJyb1 BnzDR/1RAmiSjCm5Ci8Aaj2TnovaikZ94BkpUFTyYxMYP/3plUUNNDN86/p7Ht8GmkNZ tMMThoY23ZgnnB7zIncTt/i7+53XP3nmrYX+k3G7WOSXTHYCfifZ0zQvHPLH4e/DQ0zd 6hUIs5c2jjMGvwCli5ELjjX787FHPQ//ECN8wgMXxlen/RmwDpZ20ZQ6R57OPJBxo2w4 P0lQLYIZNm5YR14U8oaB7TWwzlmGjWYC8hyEHRJm73L5xGKMcjXUDy25G47wpMXZGAaU Fqxw== 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=F0zAKMqZpKARzsInqQstkre1Tq+ySlNr5uStRAi8qf0=; b=el3PwNSwc9Na3LP6OPPgbfs6i0fMSargTtVsu5y342XyqsZBHQUyfizkv/yux/6IF1 GMM9YNfzWiMYKF/bXpuyKXTWdh8NWPOQ+UnBhxKGqm3/nIq/reuZ6YWE2qWGkeby+vcj u1rKzMXhWKs9upsBC0zoPr3P+wzNm828V13B0rzyjxPZi5Q0IT2V79cDKEsY2y1vISmb pVI7VEysR/IvJrFx/Zr+OLLtG24mCCkzXcRMyNZ0yWpUQ9ICJa2hj8ja9nuAlEjw0T0y NewNPB+H0wTI1vV2zOjulKyG/qC6VV2QbUi3QtCiBXxc/EY2BqcqmDXM4NbAHdlEpFS9 v69A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=RFrqwQlA; 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 t26si1805381ioj.103.2021.07.19.08.16.05; Mon, 19 Jul 2021 08:16:05 -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=RFrqwQlA; 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 S242810AbhGSOfX (ORCPT + 12 others); Mon, 19 Jul 2021 10:35:23 -0400 Received: from mail.kernel.org ([198.145.29.99]:47206 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244579AbhGSOeN (ORCPT ); Mon, 19 Jul 2021 10:34:13 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id F2D3E61002; Mon, 19 Jul 2021 15:13:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626707608; bh=MvPgqGi4tTT5o/ehOAay5tYuvqFudz92RH0/8OHz31k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RFrqwQlA9uoqt/paG8FRMbPmqq2OF5eFUMhYBo6ExJEb6OflRTXjsuEQHwF9I+z0i vBJtI0QQ5BYhrak4jgcroVd9m4RAbnthchN+8N1WBSn054ROJ0/DacTzZjUzwP+2kt ASthgXGrKLtjrHRa1njOvl20jCZjLkOGOZHc077o= 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 4.9 232/245] ALSA: isa: Fix error return code in snd_cmi8330_probe() Date: Mon, 19 Jul 2021 16:52:54 +0200 Message-Id: <20210719144947.882384930@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210719144940.288257948@linuxfoundation.org> References: <20210719144940.288257948@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 dfedfd85f205..463906882b95 100644 --- a/sound/isa/cmi8330.c +++ b/sound/isa/cmi8330.c @@ -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 */