From patchwork Mon Jul 19 14:53:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 479917 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp4234275jao; Mon, 19 Jul 2021 08:31:45 -0700 (PDT) X-Google-Smtp-Source: ABdhPJytY2IdrSz2En4H4WpUZbn72hJWW8fW45E8FEYwfmzI2ZnRtmCimDFIZNtFd1USvH16gcbq X-Received: by 2002:a92:cb0b:: with SMTP id s11mr17274040ilo.292.1626708705193; Mon, 19 Jul 2021 08:31:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626708705; cv=none; d=google.com; s=arc-20160816; b=zue0VX89cEDOP9H3nRLVnBx68Ta2UlM8k8M9QWoHEUnquBc2aXvGVH1JmR4J2MtuFZ SstzGqOuCQ7sjztFO1MlzCzSEiqVS21P6EYsQ1NRbtLw/jTvFXexnhq5Mf+CckRjjjul eNq/+kZNE7PTAPEqqpd54wDNTPAN8ks1JtpxzsnJPa49zfRpy8qbQJBqoo0/hUSFG0VR LH9P5pSCIWAd0XRBSIo1U/F22eVb2EHRTb9GDO7t+t1Sfwo4CmCRUF+QV1AVorXz8rua wcWWIdHT8X4lzYOeqgLs/mpvLtGIEljCvHPMazjOPo9GlJXiqkh9CTK+8E3edKOAV9V3 7y7w== 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=x6asoKXpKOyzrZ55cHebTuQseGoe/ZnIZZdyyL9hnNM=; b=CBxoUi3+ewZ2vAiNn53MmyNtxyTnP7GophAmCsr4FDqqLUMaOxGcUYZOQYYQFfavIP t4EH69a4AMiEEWZgzNntbpk/H2ARa3P1vO30QpQn3uxVUU1T9EFr9R3VfNN7uCTPftV1 oKWR4wYhmrQz1EvSpyLqb8A+3PV9k5nBtlSqkIe74r91a3WPUqJ4j8REs62vCAgwFXr8 6lONFTXK/0EhAuv10OKnmX+HiDKk/nO6ocF/j1WUpQ81y0E6yoBaHr03S5hT08UNYLyC Io7dH2GWI9PYsedeARbt31XhHnZ92ZiHO6GNwlakCAgCRL1xexXrTCHTuk1pixw5mK+Y /aFA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=HYp4SVMs; 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 g5si10245056ilk.74.2021.07.19.08.31.45; Mon, 19 Jul 2021 08:31:45 -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=HYp4SVMs; 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 S232506AbhGSOuI (ORCPT + 12 others); Mon, 19 Jul 2021 10:50:08 -0400 Received: from mail.kernel.org ([198.145.29.99]:40440 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344289AbhGSOso (ORCPT ); Mon, 19 Jul 2021 10:48:44 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 3F7306128E; Mon, 19 Jul 2021 15:27:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626708470; bh=dI0pHhPcB160m+cv+0IezzUj6hvXNpfMeDRFZDsAkXk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HYp4SVMsRbL7N4OtBPhSGApnCo2Xxz+5N0xOOv0hwNlFSLUwJofO3yZr+su2bbtBp DObMrP7RACxBLJr1vfT/EfLHErD9aCT6fiHItqFTIWM9WheJim3sZIM8A0ZmjqR12y NAfgQznqCmMuvqkUqujvALBng38Yxkl7/UiVHE1A= 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.14 296/315] ALSA: isa: Fix error return code in snd_cmi8330_probe() Date: Mon, 19 Jul 2021 16:53:05 +0200 Message-Id: <20210719144953.199255646@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210719144942.861561397@linuxfoundation.org> References: <20210719144942.861561397@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 6b8c46942efb..75b3d76eb852 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 */