From patchwork Thu Jun 16 06:36:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hui Wang X-Patchwork-Id: 1644156 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=jlZv79Dd; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4LNswP4YQ0z9sFw for ; Thu, 16 Jun 2022 16:39:32 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1o1j9w-00067q-Uw; Thu, 16 Jun 2022 06:39:16 +0000 Received: from smtp-relay-canonical-1.internal ([10.131.114.174] helo=smtp-relay-canonical-1.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1o1j9v-00067H-AF for kernel-team@lists.ubuntu.com; Thu, 16 Jun 2022 06:39:15 +0000 Received: from localhost.localdomain (unknown [123.112.64.211]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-canonical-1.canonical.com (Postfix) with ESMTPSA id 7869D402AE for ; Thu, 16 Jun 2022 06:39:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1655361554; bh=N+YSWLX4EmGPoYI5g2f37ZK4rA6M/LFwsWyD1nfBfr4=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=jlZv79DdT8/7XlYtScACPPY0EK6Wgw28bjB0jn/pZQuUeUkM2obNoco1s6YLuMx/R AGR4PJwrh6cb1ihkc2qHRJ5AvxQSTD5w7mReURhbFsdhKNWr9KjggPODdPygfQaQlB SyfZLEbQAP3L04MeUSF/z9zV+9q/cg5yYwcaxZi9PMUpotOqumNytx/dmPZCXi25LE IZAeusyk8+55Uqye+6Xk/S8K27p4bHGJsJh65JEs8oQqR+SuiIcrfkPnQnjdb1Q9/a VueklGC5S2Une2Tn/bjzlCeGXQqMm0XNyKPW3bOabxc9CPVGN7wUXM2/mQOcYnhThV PvAPb3hjbaxpQ== From: Hui Wang To: kernel-team@lists.ubuntu.com Subject: [SRU][J/OEM-5.14][PATCH 1/1] ALSA: hda/realtek: Fix mute led issue on thinkpad with cs35l41 s-codec Date: Thu, 16 Jun 2022 14:36:48 +0800 Message-Id: <20220616063648.7443-2-hui.wang@canonical.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220616063648.7443-1-hui.wang@canonical.com> References: <20220616063648.7443-1-hui.wang@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" BugLink: https://bugs.launchpad.net/bugs/1978915 The quirk ALC287_FIXUP_CS35L41_I2C_2 needs to chain the quirk ALC269_FIXUP_THINKPAD_ACPI, otherwise the mute led will not work if a thinkpad machine applies that quirk. And it will be safe if non-thinkpad machines apply that quirk since hda_fixup_thinkpad_acpi() will check and return in this case. Fixes: ae7abe36e352e ("ALSA: hda/realtek: Add CS35L41 support for Thinkpad laptops") Signed-off-by: Hui Wang Link: https://lore.kernel.org/r/20220422073937.10073-1-hui.wang@canonical.com Signed-off-by: Takashi Iwai (cherry picked from commit a6ac60b36dade525c13c5bb0838589619533efb7) Signed-off-by: Hui Wang --- sound/pci/hda/patch_realtek.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index a22220613030..9bba8904d893 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -8772,6 +8772,8 @@ static const struct hda_fixup alc269_fixups[] = { [ALC287_FIXUP_CS35L41_I2C_2] = { .type = HDA_FIXUP_FUNC, .v.func = cs35l41_fixup_i2c_two, + .chained = true, + .chain_id = ALC269_FIXUP_THINKPAD_ACPI, }, [ALC287_FIXUP_CS35L41_I2C_2_HP_GPIO_LED] = { .type = HDA_FIXUP_FUNC,