Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp2709598pxj; Mon, 10 May 2021 09:02:16 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzBbGQ4CWOGlg8ycmbXgXbfOFL/2kLnJnSrHTXVtLnwGhtOweF++f6owCQQTkF6S78lzaU5 X-Received: by 2002:a2e:9b51:: with SMTP id o17mr20118393ljj.320.1620662535972; Mon, 10 May 2021 09:02:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620662535; cv=none; d=google.com; s=arc-20160816; b=kioB8IGYu7TJx9TvavOYbNH3/yWXwMcv1zQg6pnFAsSvEYekLNVvL0roH7AJjWfZ1e gSvkw+M86rZmV7WykMgHWv3tgnX1Kd8lJo2wiCFvnSFojuktSjevVKhTLzSH8usHXYLT FRzSdy7aHg4oDEy330gPXXLAahzaMhIrJsZM0SqVhvWhA8J79owzrx8BhhUFDTaPjDEu XAbdhNVp6ROFRUoU9GXL6WrmF5G27XoQgUTQ+06JcS+KLANFGhZSS1DTWUTsSD5FvHJb z1uU60CM7THmApV0xZ4a1KnupxuGW9Vo4XrATHYlEQoT6dDdsir+bV63mDRGef44k+DA VQ4Q== 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=aNFb0BIDmoXWXZ8oSHruIVefxS4CmLVK42S9fRo52rc=; b=LSlNlN6hTRnSMt2jD+NN4k1Tx/QTMZ1sbLIH/Ef3qHcRJpvB9RIrk7pYKxsQUr/nBr COmgKJcnkjGYmXhfa/bhK70+OCg8fypyXpuo9ZwDz0xMM+GVmFr2ErmdDe6TuPJ72goX NRlcrf++kYzIrSTStEmcWrOeeOVMlvKrhiO1IBAKfAC2zuk827BiylprWg85RoW3pwl6 jN7fb+fo0kabgaNhZsyhVJx7vI3yM7CBhq2d6fieCvYg5rr55UViM0xqOrX1CJGgJ8XC oH+7R8Ud4SvagIQmP6VvrPBIvphajJ2rNdEqtvnWsZqIPdH5QWKXvptUYwXXCgh7eF7S RZ9g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=xOUti0G8; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-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 d4si3885863ejz.692.2021.05.10.09.01.51; Mon, 10 May 2021 09:02:15 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-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=xOUti0G8; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-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 S235731AbhEJM1Y (ORCPT + 99 others); Mon, 10 May 2021 08:27:24 -0400 Received: from mail.kernel.org ([198.145.29.99]:46846 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237230AbhEJLLk (ORCPT ); Mon, 10 May 2021 07:11:40 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 545BD6191A; Mon, 10 May 2021 11:08:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1620644903; bh=LBmAsoDSCELvhHwUH7si4iiI+m4X7cBv1jP7nCTK1Qw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=xOUti0G8+DpZ+IDjsslDQWEzj6/dRuphsgrAGs5t6vZaYW7AbMmKsL9zdbdq2nTB6 8BlCKYS7oRQrOK36x7IbSaBrtiUw1yFtQ+vVx8Wmz72nnGnSxxMStCiY/699q6FqlX sU/74qvq0IR/Lz0XA7atw6Vpa1fRdt0FjcieUC6E= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Takashi Iwai Subject: [PATCH 5.12 272/384] ALSA: hda/conexant: Re-order CX5066 quirk table entries Date: Mon, 10 May 2021 12:21:01 +0200 Message-Id: <20210510102023.807375748@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210510102014.849075526@linuxfoundation.org> References: <20210510102014.849075526@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Takashi Iwai commit 2e6a731296be9d356fdccee9fb6ae345dad96438 upstream. Just re-order the cx5066_fixups[] entries for HP devices for avoiding the oversight of the duplicated or unapplied item in future. No functional changes. Also Cc-to-stable for the further patch applications. Cc: Link: https://lore.kernel.org/r/20210428112704.23967-14-tiwai@suse.de Signed-off-by: Takashi Iwai Signed-off-by: Greg Kroah-Hartman --- sound/pci/hda/patch_conexant.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) --- a/sound/pci/hda/patch_conexant.c +++ b/sound/pci/hda/patch_conexant.c @@ -930,18 +930,18 @@ static const struct snd_pci_quirk cxt506 SND_PCI_QUIRK(0x103c, 0x8079, "HP EliteBook 840 G3", CXT_FIXUP_HP_DOCK), SND_PCI_QUIRK(0x103c, 0x807C, "HP EliteBook 820 G3", CXT_FIXUP_HP_DOCK), SND_PCI_QUIRK(0x103c, 0x80FD, "HP ProBook 640 G2", CXT_FIXUP_HP_DOCK), - SND_PCI_QUIRK(0x103c, 0x828c, "HP EliteBook 840 G4", CXT_FIXUP_HP_DOCK), - SND_PCI_QUIRK(0x103c, 0x83b2, "HP EliteBook 840 G5", CXT_FIXUP_HP_DOCK), - SND_PCI_QUIRK(0x103c, 0x83b3, "HP EliteBook 830 G5", CXT_FIXUP_HP_DOCK), - SND_PCI_QUIRK(0x103c, 0x83d3, "HP ProBook 640 G4", CXT_FIXUP_HP_DOCK), - SND_PCI_QUIRK(0x103c, 0x8174, "HP Spectre x360", CXT_FIXUP_HP_SPECTRE), SND_PCI_QUIRK(0x103c, 0x8115, "HP Z1 Gen3", CXT_FIXUP_HP_GATE_MIC), SND_PCI_QUIRK(0x103c, 0x814f, "HP ZBook 15u G3", CXT_FIXUP_MUTE_LED_GPIO), + SND_PCI_QUIRK(0x103c, 0x8174, "HP Spectre x360", CXT_FIXUP_HP_SPECTRE), SND_PCI_QUIRK(0x103c, 0x822e, "HP ProBook 440 G4", CXT_FIXUP_MUTE_LED_GPIO), - SND_PCI_QUIRK(0x103c, 0x836e, "HP ProBook 455 G5", CXT_FIXUP_MUTE_LED_GPIO), - SND_PCI_QUIRK(0x103c, 0x837f, "HP ProBook 470 G5", CXT_FIXUP_MUTE_LED_GPIO), + SND_PCI_QUIRK(0x103c, 0x828c, "HP EliteBook 840 G4", CXT_FIXUP_HP_DOCK), SND_PCI_QUIRK(0x103c, 0x8299, "HP 800 G3 SFF", CXT_FIXUP_HP_MIC_NO_PRESENCE), SND_PCI_QUIRK(0x103c, 0x829a, "HP 800 G3 DM", CXT_FIXUP_HP_MIC_NO_PRESENCE), + SND_PCI_QUIRK(0x103c, 0x836e, "HP ProBook 455 G5", CXT_FIXUP_MUTE_LED_GPIO), + SND_PCI_QUIRK(0x103c, 0x837f, "HP ProBook 470 G5", CXT_FIXUP_MUTE_LED_GPIO), + SND_PCI_QUIRK(0x103c, 0x83b2, "HP EliteBook 840 G5", CXT_FIXUP_HP_DOCK), + SND_PCI_QUIRK(0x103c, 0x83b3, "HP EliteBook 830 G5", CXT_FIXUP_HP_DOCK), + SND_PCI_QUIRK(0x103c, 0x83d3, "HP ProBook 640 G4", CXT_FIXUP_HP_DOCK), SND_PCI_QUIRK(0x103c, 0x8402, "HP ProBook 645 G4", CXT_FIXUP_MUTE_LED_GPIO), SND_PCI_QUIRK(0x103c, 0x8427, "HP ZBook Studio G5", CXT_FIXUP_HP_ZBOOK_MUTE_LED), SND_PCI_QUIRK(0x103c, 0x844f, "HP ZBook Studio G5", CXT_FIXUP_HP_ZBOOK_MUTE_LED),