Commit 8ecdba32 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

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
parents c00a1090 19098934

drivers/pci/controller/pcie-mt7621.c

+2 −1
Original line number Diff line number Diff line
@@ -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)