Received: by 2002:a05:6520:4211:b029:f4:110d:56bc with SMTP id o17csp2108228lkv; Thu, 20 May 2021 03:36:15 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwwgJiD2yUATXOsTpBrDl00gpW85OcbffweDNe5wNya3MJDTaZ5cXMNqYz8lwqUsEDqwOt5 X-Received: by 2002:a5d:8f81:: with SMTP id l1mr4431823iol.115.1621506975427; Thu, 20 May 2021 03:36:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621506975; cv=none; d=google.com; s=arc-20160816; b=pqpUyCHg2b5OADa2gbeW9+Ml/8a+9QTp4bgttQm2tJbPzmNzAFoVfSyZLIca1rBBgF o1Muh+SNrDNY1/yxilApKT1/prPHMa3J7/7LgdOTB1W6yU7+uRTZy8WpgSdoakQoxACO JLJ8WlpxsSNuBVPiU3it/gSe1J7UcCOrrM6MmNmKcgCna2tLs1uiQZy1HoxiM7T7i0tR Hh2FQAA/DfNEai++G2+VVE19mk4iTBn27CLq+FEeHXDanfyXmTPK0tcOhpXbODacPkHw Qs/vbK61qQiAMMDQc8727oVrjzQCLzK6roFhnU7WAzaMYIv1eeIC6oUgRl3CeXsiMOgG 0aZA== 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=V6JmOSUwKsUax6WyEXGntk1hZYEo9wxy7Ndh9jQyEWs=; b=VKzy7Nt1JsN7rx9pST0xVH+pPdGbIARdWl97bWK+bYh7+leFnl1tLOVdF813cHjArX gZzv04xJVMM3mPGTT7kDuYIxIDffexoVAY6tUc6tUDBE6vs6zU3M4cz7rXIMtd2Srgq2 KyQINp9zTuMnlB+kHPGjcZs1fT9zMouqBVapsKb+MX8LMm5wyJ8mQ+srVzkf/5u+GwNx EWwVM5kmboBLTrDA+9wpdLvp1PAqIOnrMVRNuA5tkUtkLYHdwVPdE3GLlKjk/oye5qEU 4yvVGaOkamyQZ1e7aK7DE4IJNJbA01ATWvvW3RayJmHB4jBUMapFOVLG3qU9DAYUgXv2 tv5A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=t8RksUWo; 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 f12si1970780jas.117.2021.05.20.03.35.42; Thu, 20 May 2021 03:36: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=t8RksUWo; 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 S237375AbhETKeK (ORCPT + 99 others); Thu, 20 May 2021 06:34:10 -0400 Received: from mail.kernel.org ([198.145.29.99]:51820 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235659AbhETKUf (ORCPT ); Thu, 20 May 2021 06:20:35 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 79E97619BE; Thu, 20 May 2021 09:47:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1621504060; bh=gye0KWkw9+ogmRUIBSKDkMOUZsIvhGuiSEPPaLli24I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=t8RksUWotzy3PozyLEHt7ViHHyzCLsJYOOZWMLORE4G3axDiNmIEtLqZ6JlLvQgb9 /azCuSGzm/Eqa2l+uKXx7tGDPsMfbQdYzUlo8w5HREuN7lJjUo9qf8tes8SlG6EAB7 pUHmDKqX+uyWL22AoiPOQuf4O4M18j7em4ZXGRTU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Takashi Iwai Subject: [PATCH 4.14 074/323] ALSA: hda/conexant: Re-order CX5066 quirk table entries Date: Thu, 20 May 2021 11:19:26 +0200 Message-Id: <20210520092122.628138354@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210520092120.115153432@linuxfoundation.org> References: <20210520092120.115153432@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 @@ -948,18 +948,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(0x1043, 0x138d, "Asus", CXT_FIXUP_HEADPHONE_MIC_PIN),