Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp2509322pxj; Mon, 10 May 2021 04:51:01 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzVZOTVS+I3dSrDP78aX35yrF6kP25/3MGzflxngIzL7Gd82gdqyz8D8nRe7FXZHfS0LREN X-Received: by 2002:a17:906:1147:: with SMTP id i7mr18840783eja.20.1620647461527; Mon, 10 May 2021 04:51:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620647461; cv=none; d=google.com; s=arc-20160816; b=EtQQoVAUnvavOF54QHB2t5OsHMXsr6i/HcMcb7Kyysz+6t/Y3M7Arc0rAGR9A5yScd rHOZOX/TTJ7pCWhui6XOPu/JmmzE5uluBbYoIiTaBo2bVL89Q2K0Jvqp+PbIg1my/9gD wZy68C8CWPfnrlk5woqRD4BA/VAleqgn/3mh/Xg9LIBmG+WqxT9sFhw4w2lsweQG7mtg vaSEgzr5DyXvJNiPYNa7d2OkHEuTcbg/Cw2rRsfOEk234RCTEeZ70SD2lYHD4quJHvPa bmGVI5U5QW7sTS/hmOu6Pg+w5GznNFv2D1MUKZYC3t/babrs8DCFdNQJCNXFN5Mz+sR3 NbZw== 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=OusDq37zwognJjs2KkJKisdZ+hmLzIiEvaRxMg+0xqTasM8CwDihwmSGiUOnohHOMS H4b3frRialgJM2qXrsRd4LWR9pioSOISkri8oIq8JpQd8YcQTHZOVAGVzz12qOwLYh+i 2FUd5dAfDatLKWvmghzlYQLxwhoxkhyxVYaLj2rpVD0WHK7DlLAIO08I1pq7G2n9r+W4 7hr5nPzQU+4WHo+BVEh3Jspf7U5SuqUgkCh4moJqSfWk4ZGRsQAk/8AQim2/NudPnP9u 7oPjRmGmq1OGffbAARSh2YR1nGXrcf3U483eGK2TAlN7L6iC0998W+JdrPjwxqmJ6NTY XN7w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=to+Pi2b6; 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 k22si15146452edv.400.2021.05.10.04.50.37; Mon, 10 May 2021 04:51:01 -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=to+Pi2b6; 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 S242762AbhEJLrm (ORCPT + 99 others); Mon, 10 May 2021 07:47:42 -0400 Received: from mail.kernel.org ([198.145.29.99]:54598 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235140AbhEJLAJ (ORCPT ); Mon, 10 May 2021 07:00:09 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 60F6461C44; Mon, 10 May 2021 10:53:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1620643988; bh=LBmAsoDSCELvhHwUH7si4iiI+m4X7cBv1jP7nCTK1Qw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=to+Pi2b634Wq5GxDVCXO4InRQYwgf75f+bJlXXyfRzMUUactlqHtIMQcdXjxAWo3K JOqSAu0gQvDkx/iMaWkt5Jlg3+Jd7rpnmjHct/cxr9yGtrqgv43IBPSEMs7pVtmhGe nqN/XWxpMyY9mqxHQnEmPsShgyZtcJWXlzDQc2Ao= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Takashi Iwai Subject: [PATCH 5.11 241/342] ALSA: hda/conexant: Re-order CX5066 quirk table entries Date: Mon, 10 May 2021 12:20:31 +0200 Message-Id: <20210510102018.049388916@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210510102010.096403571@linuxfoundation.org> References: <20210510102010.096403571@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),