Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp2466461pxj; Mon, 10 May 2021 03:47:21 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzbkt1aDYIJ4fA8LRWqX7ERvF1MyWE6q7lvy3UEO3wiZnSPeDxaJBoeQArpF6liHjmgGkmt X-Received: by 2002:a92:c7a9:: with SMTP id f9mr19829748ilk.255.1620643641355; Mon, 10 May 2021 03:47:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620643641; cv=none; d=google.com; s=arc-20160816; b=p00zFp8YIH1j3uxoREdfM879AfSpqwEBUgN8Y0mZxZ/uqprucSp/WWgQmLR3gOM4Jv oMSsJbRBE+q1kHed5FHH2K1/qtlMD5Of1Ry/MqrQX1cIIhNlgcaLclAPFuRIttTEbSPg OC2yGTB8SN4Ss8jegXBhPX5ks7kaIJMafhL2yUE1TvregNonbsWEJClSeRUftvh9fqVH tbSF0WppX1khFbc1FNPdF8Al3IhXND23GR6/SesgBKU8eI6TfLTQlzrw0Q0EeD7R9B1H DOrDga93a2m+VUR5xC4+5DQIzhGpYXB5+Mp8Kp6VLZV/69ZtbfgWkZvpnzRfpvqpNS1v 13Sg== 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=TDlU5eKaKTECfjj5f3LCZ/HZLGWiLXM6xcZ+dYZunME=; b=ekNBEMNwtBfhlXaMcchE2oyL4ANYyOKgUJEEulCpjtWJ3R33CTry0Wqqgf2Kpr5JRx OR7ZFR9BDfUa7H5Tc+vamz7593TZLr5u6DJkMd0dovYzo02q4IQ1lkL6J+WJKLYEpWNC H80NhEHFfVSYDjYSG+CWnMCLx7uNloEiHT91k5AwBbvLcAOp/XQdHi1Tzx4cpxEu2CZL lnr0r8HsW86NUs9lfi7COwwEsYwVtVtFNuxnilaxtoPpHaTfFjsfTLNb4m9xHdbkbfJ+ EjaKNQIcL3f7FXnpgBSCP8me+4V4EIPLla80WYW+nHQJziQ1SR8qtm7w2/6jFDAnQNcS vn/g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="S5yB/HVC"; 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 y3si17231781jai.94.2021.05.10.03.47.09; Mon, 10 May 2021 03:47:21 -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="S5yB/HVC"; 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 S233160AbhEJKqb (ORCPT + 99 others); Mon, 10 May 2021 06:46:31 -0400 Received: from mail.kernel.org ([198.145.29.99]:48980 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231434AbhEJKiO (ORCPT ); Mon, 10 May 2021 06:38:14 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 2D09E61946; Mon, 10 May 2021 10:29:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1620642599; bh=A+TOYgvLInLo+mVQHt+1q9p0U53r4IOGMT/vtKwTOW0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=S5yB/HVCK9wl1ZG6eUa08h5pvCPG7sHje71O8l9AOtNJkmFpJ7RjhB2SiC7b4cP7w Itgp0KxxmtQ0nHAUeQE9WD4zJV37Nq1jXbv/Pik+W3l06A6eZb1tkDwZPvXNFj+0ZO 9VQx9+mQfSRqdOb0MePUdKigPtdxRYuPwomtoEPI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Takashi Iwai Subject: [PATCH 5.4 126/184] ALSA: hda/conexant: Re-order CX5066 quirk table entries Date: Mon, 10 May 2021 12:20:20 +0200 Message-Id: <20210510101954.300899617@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210510101950.200777181@linuxfoundation.org> References: <20210510101950.200777181@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 @@ -898,18 +898,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, 0x8455, "HP Z2 G4", CXT_FIXUP_HP_MIC_NO_PRESENCE), SND_PCI_QUIRK(0x103c, 0x8456, "HP Z2 G4 SFF", CXT_FIXUP_HP_MIC_NO_PRESENCE),