summaryrefslogtreecommitdiff
path: root/drivers/pci/controller
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2022-12-10 19:36:38 +0300
committerBjorn Helgaas <bhelgaas@google.com>2022-12-10 19:36:38 +0300
commit8ecdba32a500bbc6c571ea96656eb664b0038f8d (patch)
tree8984c62de3368e84db633a5d4da02cbd3190b6a4 /drivers/pci/controller
parentc00a1090544ed7d97dee0b49c5a5c063052bdeab (diff)
parent19098934f910b4d47cb30251dd39ffa57bef9523 (diff)
downloadlinux-8ecdba32a500bbc6c571ea96656eb664b0038f8d.tar.xz
Merge branch 'remotes/lorenzo/pci/mt7621'
- Add sentinel to mt7621_pcie_quirks_match[] to prevent oops when parsing the table (John Thomson) * remotes/lorenzo/pci/mt7621: PCI: mt7621: Add sentinel to quirks table
Diffstat (limited to 'drivers/pci/controller')
-rw-r--r--drivers/pci/controller/pcie-mt7621.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/pci/controller/pcie-mt7621.c b/drivers/pci/controller/pcie-mt7621.c
index 4bd1abf26008..ee7aad09d627 100644
--- a/drivers/pci/controller/pcie-mt7621.c
+++ b/drivers/pci/controller/pcie-mt7621.c
@@ -466,7 +466,8 @@ static int mt7621_pcie_register_host(struct pci_host_bridge *host)
}
static const struct soc_device_attribute mt7621_pcie_quirks_match[] = {
- { .soc_id = "mt7621", .revision = "E2" }
+ { .soc_id = "mt7621", .revision = "E2" },
+ { /* sentinel */ }
};
static int mt7621_pcie_probe(struct platform_device *pdev)