From patchwork Thu Sep 14 12:11:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Fitzgerald X-Patchwork-Id: 139592 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:172:b0:3f2:4152:657d with SMTP id h50csp354013vqi; Thu, 14 Sep 2023 06:36:58 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEhlWWHX0idwFIWM0K9dSk7tF/Ahu96+428Q4Bc9asJO+JlP7zOd9jYrzJbTQdVeAfPtBuf X-Received: by 2002:a17:903:2341:b0:1c2:811:2cee with SMTP id c1-20020a170903234100b001c208112ceemr6706604plh.23.1694698618059; Thu, 14 Sep 2023 06:36:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694698618; cv=none; d=google.com; s=arc-20160816; b=hB2buYU0l5DxRpPxeJ1qMZsoOgtOv1svYV/TmKnWj4Rnkyk5ZY6FHOBlf0IlIZ4ssS eeHn+08ekEZdPKTk35qGvFQl/+LXuOPW5egx9aZ4gtRKCy5s/lULg4ok/+lRcoyxvprM pUz3orBTT8xa50ERPpNZLPto81HOuyd1qWctYUHuwsS2cgncizO6Zjw6WsjsQl6s41bp 9Cuu0mACRtF5v8vNXiNaWnw2cENHHylbas93o9gZve+sv/P9TQvQRsnPZpDlJzKaYL8c P5R8nnqcdv7lPMJBkT24nJLRiElUOOctjNNeiAaewg/oqa5OkDxiyRfAYfitumkA3tHM kZAA== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=Anv7LULgGpfntaEAW5v8GiBoJeIf6esI1Pwibsff3+0=; fh=SyhPsGKNo/JGCZgOgs8oor82YQAWZ9kc5f/0PFOAxm0=; b=l9p9sssDh0SdTgcDnDJHCiQ4EaAUlfX53quMpSmxVJRzDy+1MeGGyXpnIiESRB76fr JBiEYltQJgZ1eSIPwDXDJlyVD1Rhq4c/sdyds9FOrzxdzRUoKL1QyXJcFaBI/K3TKByW uvp5Z9QBD0VtRNNM8yR2hcs9e6QZXpNJE2jPywOlaolPPG4Lw47+o3XlD0BGRS6cK3ua 8X4ODiNZMQZw/OxEYjDqCKH8+CoLDvKkrOQQU24CB6hNwpgPlSNtSOTohnzVusGPnTMb /nX5uHcYla4TTCz6EYO4tlrLJBbuYgVRVggI1dI0mfdMdxxtYAPYwQ21EA676TNtJCHX NYlw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@cirrus.com header.s=PODMain02222019 header.b=DRGqFmbl; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=cirrus.com Received: from lipwig.vger.email (lipwig.vger.email. [23.128.96.33]) by mx.google.com with ESMTPS id j5-20020a170903024500b001bbd785e1d2si1839179plh.201.2023.09.14.06.36.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Sep 2023 06:36:58 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) client-ip=23.128.96.33; Authentication-Results: mx.google.com; dkim=pass header.i=@cirrus.com header.s=PODMain02222019 header.b=DRGqFmbl; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=cirrus.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by lipwig.vger.email (Postfix) with ESMTP id 7AF38804BDE6; Thu, 14 Sep 2023 05:11:56 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238359AbjINMLi (ORCPT + 35 others); Thu, 14 Sep 2023 08:11:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46098 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238119AbjINMLi (ORCPT ); Thu, 14 Sep 2023 08:11:38 -0400 Received: from mx0b-001ae601.pphosted.com (mx0b-001ae601.pphosted.com [67.231.152.168]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 124411BE8 for ; Thu, 14 Sep 2023 05:11:33 -0700 (PDT) Received: from pps.filterd (m0077474.ppops.net [127.0.0.1]) by mx0b-001ae601.pphosted.com (8.17.1.22/8.17.1.22) with ESMTP id 38E9lh9Z015602; Thu, 14 Sep 2023 07:11:26 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cirrus.com; h= from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding:content-type; s=PODMain02222019; bh=A nv7LULgGpfntaEAW5v8GiBoJeIf6esI1Pwibsff3+0=; b=DRGqFmblwSlQIp2bK +nwh5CQNs5cRfK1zpRlx9k6MbvTLR+lnEFtkg/LiAF+5HH0WEPfMHZJpQWZlK0Cq bS/h35Q+Kk8i46qY91NriQj2UFfCwbbjGHbY19NXTan50jbZwevjKK5ValCGQi+G 4TGePr64qQLA/fcPSVMNx3EzMLG7KYGVv4Q1HOI2J1i9hS3GC8uDfz7DmP31ERPc 1Xo8vbt+QRHcSrj7L52JkpT7DsiD6zLy0zhkHyMUVIkEFI04v9hfsoom4h5RFpm1 5ClpD0ejGvEkAUrr6V1mMTTlgMESXxy9KBOvo3Wb8FXcyHXmkQjTdKrJAS5WsfCh X+TiA== Received: from ediex01.ad.cirrus.com ([84.19.233.68]) by mx0b-001ae601.pphosted.com (PPS) with ESMTPS id 3t2y7sj1sm-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 14 Sep 2023 07:11:26 -0500 (CDT) Received: from ediex01.ad.cirrus.com (198.61.84.80) by ediex01.ad.cirrus.com (198.61.84.80) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.37; Thu, 14 Sep 2023 13:11:25 +0100 Received: from ediswmail.ad.cirrus.com (198.61.86.93) by ediex01.ad.cirrus.com (198.61.84.80) with Microsoft SMTP Server id 15.2.1118.37 via Frontend Transport; Thu, 14 Sep 2023 13:11:25 +0100 Received: from EDIN4L06LR3.ad.cirrus.com (EDIN4L06LR3.ad.cirrus.com [198.61.65.215]) by ediswmail.ad.cirrus.com (Postfix) with ESMTP id C4DAB3563; Thu, 14 Sep 2023 12:11:24 +0000 (UTC) From: Richard Fitzgerald To: CC: , , , Richard Fitzgerald Subject: [PATCH] ALSA: hda: cs35l56: Fix missing RESET GPIO if _SUB is missing Date: Thu, 14 Sep 2023 13:11:20 +0100 Message-ID: <20230914121120.6201-1-rf@opensource.cirrus.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 X-Proofpoint-GUID: cZVWMLgfZc3ILgca3yz8QMRYONwXQDUB X-Proofpoint-ORIG-GUID: cZVWMLgfZc3ILgca3yz8QMRYONwXQDUB X-Proofpoint-Spam-Reason: safe Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (lipwig.vger.email [0.0.0.0]); Thu, 14 Sep 2023 05:11:56 -0700 (PDT) X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lipwig.vger.email X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777020298439136362 X-GMAIL-MSGID: 1777020298439136362 In cs35l56_hda_read_acpi() do not return if ACPI _SUB is missing. A missing _SUB means that the driver cannot load a system-specific firmware, because the firmware is identified by the _SUB. But it can fallback to a generic firmware. Unfortunately this was being handled by immediately returning 0, which would skip the remaining ACPI configuration in cs35l56_hda_read_acpi() and so it would not get the RESET GPIO. Signed-off-by: Richard Fitzgerald Fixes: 73cfbfa9caea ("ALSA: hda/cs35l56: Add driver for Cirrus Logic CS35L56 amplifier") --- sound/pci/hda/cs35l56_hda.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/sound/pci/hda/cs35l56_hda.c b/sound/pci/hda/cs35l56_hda.c index 9e4976bdb5e0..a9844336bdc9 100644 --- a/sound/pci/hda/cs35l56_hda.c +++ b/sound/pci/hda/cs35l56_hda.c @@ -864,15 +864,11 @@ static int cs35l56_hda_read_acpi(struct cs35l56_hda *cs35l56, int id) sub = acpi_get_subsystem_id(ACPI_HANDLE(cs35l56->base.dev)); - if (IS_ERR(sub)) { - /* If no ACPI SUB, return 0 and fallback to legacy firmware path, otherwise fail */ - if (PTR_ERR(sub) == -ENODATA) - return 0; - else - return PTR_ERR(sub); - } - - cs35l56->system_name = sub; + if (IS_ERR(sub)) + dev_err_probe(cs35l56->base.dev, PTR_ERR(sub), + "Read ACPI _SUB failed: fallback to generic firmware\n"); + else + cs35l56->system_name = sub; cs35l56->base.reset_gpio = devm_gpiod_get_index_optional(cs35l56->base.dev, "reset",