From patchwork Mon Jul 19 14:53:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "gregkh@linuxfoundation.org" X-Patchwork-Id: 479971 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp4250693jao; Mon, 19 Jul 2021 08:48:47 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzs5tHJRTad5n1ZI1XdsN0zSLsZ2tNlOYajLWxk197WHvXapnJ9DTQBgdFZ6QWstUYGiIIp X-Received: by 2002:a17:906:13d4:: with SMTP id g20mr27752116ejc.337.1626709727119; Mon, 19 Jul 2021 08:48:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626709727; cv=none; d=google.com; s=arc-20160816; b=xBZs2x7qpbZYn3lZo6Kcplwr9C/n81DAbcU4K03I3DWV3FoxtAL1M23fxhZ2kZtdVd f1EeOb3+4OKJs8bY/kjhJ33NW8ElCST2rQLsoBIedD9jsanE3kkVu4U7KbP6t55HTpiM SUHJf2yOi4RsfAKzdeDIZEFSNlfsfZgRwQJZ2VphjLTUu7MVfwLAMNUaGns+LB8urhvv 44JMaVXgoah0Nd0J4mfoIpugLvdeXjRL6sJupyFl2IkFNZsfwWWdPW/ACDsdoWXJRuiq QhiVManoJL9P4FcBZrEU0gCnXVBc8zzm2NkDe7hR66hgjq1eUDrFRJHfxA7E0yIKNZ3m DKWw== 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=SSffp7xqE91akEPg3WdyK8RWyCxfhyrteC/k2R0t1r8CaT+fgbpP0Gzas6GQf0izzp SF4nPCgniG81pvbwk31WbCL1+UxhGAOjnPB84bXc7szUWfUcjabuHP9aHCtojO4+Mj6Y V2YyGfKRbCbeRD/0yQ5nTU5U5uVibe0YsRyIMHB3eoDqGIrdkMejYyFdCxnchk1mPiPD WKRheShXQA7yh5riKWqAufT2LkvKSAdmlmv+2L+EgAoDm0MQOIGefP2i65M01b+P1UII 6M/78/i/39Z67UrdF3jUD85otM7up8trBqNvGLAP9GEbW/WRI4+q+G20Z8Z1/rUGrX4f nPwg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=NGXkh+4b; 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 x22si21782145edd.466.2021.07.19.08.48.46; Mon, 19 Jul 2021 08:48:47 -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=NGXkh+4b; 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 S1344086AbhGSPID (ORCPT + 12 others); Mon, 19 Jul 2021 11:08:03 -0400 Received: from mail.kernel.org ([198.145.29.99]:60470 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345580AbhGSPEm (ORCPT ); Mon, 19 Jul 2021 11:04:42 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 53EB5608FC; Mon, 19 Jul 2021 15:44:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626709466; bh=dI0pHhPcB160m+cv+0IezzUj6hvXNpfMeDRFZDsAkXk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NGXkh+4bK/jhiqpXSJ8I6MfcDtMqWsBwL4H6ePdRah/R5R52ziHe92jlaBh4QDinn G5w0ox4a5D8oGlRKtrwDHd/XepB6t1G02DGUnwtTEyKBACnk2+0UZFYlzGFgBmai9+ IPlOkYBIEJQeY1D335uYXS9G0SzECd4KGG84rLLY= 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.19 394/421] ALSA: isa: Fix error return code in snd_cmi8330_probe() Date: Mon, 19 Jul 2021 16:53:25 +0200 Message-Id: <20210719145000.029787011@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210719144946.310399455@linuxfoundation.org> References: <20210719144946.310399455@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 */