---

yaml
---
r: 259315
b: refs/heads/master
c: 5bf8f50
h: refs/heads/master
i:
  259313: f8dd7ff
  259311: d6a1904
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7808edcd306f22aeb23775d34e70b7fa2f58b852
+refs/heads/master: 5bf8f501e05930364b345ed8710c5b1a13207134

trunk/drivers/tty/serial/8250_pci.c

@@ -39,6 +39,7 @@ struct pci_serial_quirk {
 	u32	device;
 	u32	subvendor;
 	u32	subdevice;
+	int	(*probe)(struct pci_dev *dev);
 	int	(*init)(struct pci_dev *dev);
 	int	(*setup)(struct serial_private *,
 			 const struct pciserial_board *,
@@ -2662,11 +2663,19 @@ EXPORT_SYMBOL_GPL(pciserial_resume_ports);
 static int __devinit
 pciserial_init_one(struct pci_dev *dev, const struct pci_device_id *ent)
 {
+	struct pci_serial_quirk *quirk;
 	struct serial_private *priv;
 	const struct pciserial_board *board;
 	struct pciserial_board tmp;
 	int rc;
 
+	quirk = find_quirk(dev);
+	if (quirk->probe) {
+		rc = quirk->probe(dev);
+		if (rc)
+			return rc;
+	}
+
 	if (ent->driver_data >= ARRAY_SIZE(pci_boards)) {
 		printk(KERN_ERR "pci_init_one: invalid driver_data: %ld\n",
 			ent->driver_data);