summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2024-02-27 12:12:14 +0200
committeriwlwifi publisher <>2024-04-17 12:59:30 +0000
commitf252e73857b991d920c0fc1abc58cae8851483fd (patch)
treee8fee22a78bd6522a9c3fcab8048556c43d9c87c
parent90d6d0bec8fae6919ed894a564e71cb097df6ac4 (diff)
downloadbackport-iwlwifi-f252e73857b991d920c0fc1abc58cae8851483fd.tar.gz
wifi: iwlwifi: pcie: remove duplicate PCI IDs entry
There's a duplicate entry for 0x51f1, which shouldn't be present, though the first entry will correctly be taken. Remove the second one. type=cleanup fixes=Ic06a085832ac3f988c8ef07d856c8e281563295d ticket=none Change-Id: I0d028993e17e26b63c0ee89d7b1714ec88f2a158 Signed-off-by: Johannes Berg <johannes.berg@intel.com> Reviewed-on: https://gerritwcs.ir.intel.com/c/iwlwifi-stack-dev/+/96395 automatic-review: iil_jenkins iil_jenkins <EC.GER.UNIX.IIL.JENKINS@INTEL.COM> tested: iil_jenkins iil_jenkins <EC.GER.UNIX.IIL.JENKINS@INTEL.COM> Reviewed-by: Miriam Rachel Korenblit <miriam.rachel.korenblit@intel.com> Reviewed-by: Mukesh Sisodiya <mukesh.sisodiya@intel.com> x-iwlwifi-stack-dev: f2577e3bf8337bee09455ce76f3969bc566b9608
-rw-r--r--drivers/net/wireless/intel/iwlwifi/pcie/drv.c1
-rw-r--r--versions2
2 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
index a227590c8e..4b52686aa5 100644
--- a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
@@ -306,7 +306,6 @@ static const struct pci_device_id iwl_hw_card_ids[] = {
{IWL_PCI_DEVICE(0x7AF0, PCI_ANY_ID, iwl_so_trans_cfg)},
{IWL_PCI_DEVICE(0x51F0, PCI_ANY_ID, iwl_so_long_latency_trans_cfg)},
{IWL_PCI_DEVICE(0x51F1, PCI_ANY_ID, iwl_so_long_latency_imr_trans_cfg)},
- {IWL_PCI_DEVICE(0x51F1, PCI_ANY_ID, iwl_so_long_latency_trans_cfg)},
{IWL_PCI_DEVICE(0x54F0, PCI_ANY_ID, iwl_so_long_latency_trans_cfg)},
{IWL_PCI_DEVICE(0x7F70, PCI_ANY_ID, iwl_so_trans_cfg)},
diff --git a/versions b/versions
index d997075996..cba844da47 100644
--- a/versions
+++ b/versions
@@ -2,4 +2,4 @@ BACKPORTS_VERSION="(see git)"
BACKPORTED_KERNEL_VERSION="(see git)"
BACKPORTED_KERNEL_NAME="iwlwifi"
BACKPORTS_BUILD_TSTAMP=__DATE__ \" \" __TIME__
-BACKPORTS_GIT_TRACKED="iwlwifi-stack-public:master:11946:a22357b5"
+BACKPORTS_GIT_TRACKED="iwlwifi-stack-public:master:11947:f2577e3b"