Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp2487859pxj; Mon, 10 May 2021 04:18:04 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw5H+fd/WyAc+D+TYw/0ooZzrXZmprCtNhdgArS0Q2Wp2lAnbiGvef0brGBkV5cEwth3DIp X-Received: by 2002:a92:c8d0:: with SMTP id c16mr22150822ilq.238.1620645484471; Mon, 10 May 2021 04:18:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620645484; cv=none; d=google.com; s=arc-20160816; b=PBgkC4T2Kn0rxgz7Q80S+v6bh6MrQyli2kSzzBp4mcAHo+hgZ2cBD3BWvZE/RZxnQL Dtwo93wGl54i3+Iews4U1qPEpqTUevM0vn0ZmgN04IRrCAwZd4GAV/DB/xMGlB4JRDfR XIhH+vpZJp6cRz+F4RDMPBJ5jAN3yOGl2YSF8d+4bJABCcW0LFnrBiUwFG8hDv0fdFSW dAeY7+5RvqDbcA0jEAApVd5bVjwI1FeuoZ18JZBjkjxPeZbx7lyq6Zu5iPFTXpoYcdXW DGMB8qt2bdY+u8fVoguc/P14b2gESg7fHcGtxWKrOnJwBPegyWuLeFoPrdG23H5Vaz/Z ZqKA== 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=o8h9mbGMBAMgXj9K/xkdxguyAjbJORGLGLgENwr2Hz4CRiR20zNQNtSpRLPsq8uAPd um/m4Qv/0js1AZUa3qTkPxdhieM7Y6DTGN7DhSNnuQJ5LjkAjLT++P6zlpEmA3NuaU03 Rl25W4zLSrYYK+E/K23wil/0r/eXHR8JiL9z5YoN6Z1NY7JwWa2yyTGa6YmUf5PqfOzI ZA7CRmnyNo1iKYPlyMCTr5jDYhMLIY+d0Ro+WTflHUAnsTce4bf/sJcFA8CP51fK5zLF mnngiLzdy3Qhv7YFI2wPwQm0k2YnEFGEyD6+PACxw/J7e1HQgK91hslGHEQjci9tW7R4 5Psg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=TjoeZu+y; 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 n3si18622697ioh.98.2021.05.10.04.17.52; Mon, 10 May 2021 04:18:04 -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=TjoeZu+y; 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 S235958AbhEJLNz (ORCPT + 99 others); Mon, 10 May 2021 07:13:55 -0400 Received: from mail.kernel.org ([198.145.29.99]:42040 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233628AbhEJKu1 (ORCPT ); Mon, 10 May 2021 06:50:27 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 4E4616157F; Mon, 10 May 2021 10:39:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1620643177; bh=LBmAsoDSCELvhHwUH7si4iiI+m4X7cBv1jP7nCTK1Qw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TjoeZu+yvwJvY4uU9gWVuDVY3oea5YTkTA3J2zaZfPH34VIIZuesMGOeYAZzglCuC B469cV9g22FJxHKprnKBGgIds3qT3aNq9koHKgWh9eTcY1B6acOtWYz+w/96dBTgc6 Iq0bthUmcr1/3dnBe/91D17odTqI2an8HPmi0zxE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Takashi Iwai Subject: [PATCH 5.10 210/299] ALSA: hda/conexant: Re-order CX5066 quirk table entries Date: Mon, 10 May 2021 12:20:07 +0200 Message-Id: <20210510102011.878267242@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210510102004.821838356@linuxfoundation.org> References: <20210510102004.821838356@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),