]> git.baikalelectronics.ru Git - kernel.git/commitdiff
PCI/PM: Fix bridge_d3_blacklist[] Elo i2 overwrite of Gigabyte X299
authorBjorn Helgaas <bhelgaas@google.com>
Thu, 26 May 2022 21:52:23 +0000 (16:52 -0500)
committerBjorn Helgaas <bhelgaas@google.com>
Tue, 31 May 2022 20:06:19 +0000 (15:06 -0500)
f3a1035cca6a ("PCI/PM: Avoid putting Elo i2 PCIe Ports in D3cold") omitted
braces around the new Elo i2 entry, so it overwrote the existing Gigabyte
X299 entry.  Add the appropriate braces.

Found by:

  $ make W=1 drivers/pci/pci.o
    CC      drivers/pci/pci.o
  drivers/pci/pci.c:2974:12: error: initialized field overwritten [-Werror=override-init]
   2974 |   .ident = "Elo i2",
        |            ^~~~~~~~

Link: https://lore.kernel.org/r/20220526221258.GA409855@bhelgaas
Fixes: f3a1035cca6a ("PCI/PM: Avoid putting Elo i2 PCIe Ports in D3cold")
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Cc: stable@vger.kernel.org # v5.15+
drivers/pci/pci.c

index 8761828734681db573f467341857addc03a70e74..cfaf40a540a82771f3e6ab69a2e9784dfec0667f 100644 (file)
@@ -2967,6 +2967,8 @@ static const struct dmi_system_id bridge_d3_blacklist[] = {
                        DMI_MATCH(DMI_BOARD_VENDOR, "Gigabyte Technology Co., Ltd."),
                        DMI_MATCH(DMI_BOARD_NAME, "X299 DESIGNARE EX-CF"),
                },
+       },
+       {
                /*
                 * Downstream device is not accessible after putting a root port
                 * into D3cold and back into D0 on Elo i2.