From patchwork Mon Jul 19 14:52:44 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: 479861 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp4212003jao; Mon, 19 Jul 2021 08:06:22 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxvPyWc+HdXFS21cqdqaLb8M7f2snekgLdUDvnqKXb3NlbzXV3PBTROjIhlXmjJTdHDreH9 X-Received: by 2002:a5d:9e4f:: with SMTP id i15mr16489100ioi.58.1626707182505; Mon, 19 Jul 2021 08:06:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626707182; cv=none; d=google.com; s=arc-20160816; b=Lie17NekN1x53HscUDMSV+Yfb+RV/mTPnNIfoeNsqPlM9P0oHCnzz7DfCfPSOrP5Tt 77XSSID0ndrxPQkxADoBANWOOre2W6UOhVYsS3qn5nskyqOMCv12GZxY7tpZXeZ1LfL/ P3GjNzkAzr40WxyPjEkO/p9mMTzDQSXkERLDPAlgIBsk427t/EOf6nPEpn16XJ/N6wW5 HBKtXiEAi6nJGH6HfaPRvoi1WtfRfnDOipAS0veRzi4dvBVWt7Qnut6Pk/AQpPk6vOZT 1JQnexKLg4xFujobkca/kX1v8lXcNLSKvx6sAq+zRtXoPRuhNtNL9qhg6q9odALCpchz oV4A== 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=Zb5BufJ6VjqW6B30Gzrsqhpti/CEiLZLr/4ny4qtTFVZdF1HwnZLOZO3Ws37aD9S8R F1eBErZpqrK31HqyFlaeQVnjt6SlwJaxDp4S094+4ahIh/61SqIIwnpgk/meFrYoj/Tm Mz+1zETD1gt+PcqQLqmPVCjHWOxXEpTAspaSzpkWqRJz96G9M4/vdV8HqfokQ+ur7HgC TUJegvkRiwuogMY3PYCa1Lvr64mkHlgg1ZaxX3GBMxApsp5jYhkLD4VBXZp01fOgWude xanCaY6njjdlcKaRGhPRXF5towlRCjXsD42KfS4Gc236kX5EYDpaEdfsarnRYzADLI1D hk/g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="XyL08Qq/"; 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 j1si11218793jak.102.2021.07.19.08.06.22; Mon, 19 Jul 2021 08:06:22 -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="XyL08Qq/"; 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 S243234AbhGSOZh (ORCPT + 12 others); Mon, 19 Jul 2021 10:25:37 -0400 Received: from mail.kernel.org ([198.145.29.99]:57286 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242807AbhGSOXt (ORCPT ); Mon, 19 Jul 2021 10:23:49 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id D9C5361181; Mon, 19 Jul 2021 15:03:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626707000; bh=MvPgqGi4tTT5o/ehOAay5tYuvqFudz92RH0/8OHz31k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XyL08Qq/keYyb1wuxMEvQCcbaN/pwOijZHd5nKrlIqoFsDLbzeSocnuVK5TNJepqS qb2ivd6xDh+V8k0RD6wZ/xLaZcuA/fOxBBu9uljSaFGynqTlwbu24EAL0kOxX7LbCZ cKDr54XsUKJplAde6ywFkWZoO+QmQPHoyfW804bk= 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.4 180/188] ALSA: isa: Fix error return code in snd_cmi8330_probe() Date: Mon, 19 Jul 2021 16:52:44 +0200 Message-Id: <20210719144942.376985006@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210719144913.076563739@linuxfoundation.org> References: <20210719144913.076563739@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 */