From f9c38269788fe6576584040d2144e6157dde9c5e Mon Sep 17 00:00:00 2001 From: Yinghai Lu Date: Mon, 21 Jan 2013 13:20:51 -0800 Subject: [PATCH] --- yaml --- r: 358417 b: refs/heads/master c: 58d9a38f6facb28e935ec2747f6d9e9bf4684118 h: refs/heads/master i: 358415: 9a40faefcf568d4eb54ec2a0b4700907a82cae7c v: v3 --- [refs] | 2 +- trunk/drivers/pci/bus.c | 5 +++++ trunk/drivers/pci/pci-driver.c | 6 +++++- trunk/include/linux/pci.h | 1 + 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index c2bff6ee308a..e4df0ffb07c0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d59f53bc9bd80ee62072dea590fc623c67cb84a8 +refs/heads/master: 58d9a38f6facb28e935ec2747f6d9e9bf4684118 diff --git a/trunk/drivers/pci/bus.c b/trunk/drivers/pci/bus.c index 847f3ca47bb8..c8709c6fdb7c 100644 --- a/trunk/drivers/pci/bus.c +++ b/trunk/drivers/pci/bus.c @@ -177,10 +177,15 @@ int pci_bus_add_device(struct pci_dev *dev) if (retval) return retval; + dev->match_driver = false; retval = device_add(&dev->dev); if (retval) return retval; + dev->match_driver = true; + retval = device_attach(&dev->dev); + WARN_ON(retval < 0); + dev->is_added = 1; pci_proc_attach_device(dev); pci_create_sysfs_dev_files(dev); diff --git a/trunk/drivers/pci/pci-driver.c b/trunk/drivers/pci/pci-driver.c index f79cbcd3944b..acdcc3c6ecdd 100644 --- a/trunk/drivers/pci/pci-driver.c +++ b/trunk/drivers/pci/pci-driver.c @@ -1186,9 +1186,13 @@ pci_dev_driver(const struct pci_dev *dev) static int pci_bus_match(struct device *dev, struct device_driver *drv) { struct pci_dev *pci_dev = to_pci_dev(dev); - struct pci_driver *pci_drv = to_pci_driver(drv); + struct pci_driver *pci_drv; const struct pci_device_id *found_id; + if (!pci_dev->match_driver) + return 0; + + pci_drv = to_pci_driver(drv); found_id = pci_match_device(pci_drv, pci_dev); if (found_id) return 1; diff --git a/trunk/include/linux/pci.h b/trunk/include/linux/pci.h index 907b455ab603..8ee7e4e46539 100644 --- a/trunk/include/linux/pci.h +++ b/trunk/include/linux/pci.h @@ -286,6 +286,7 @@ struct pci_dev { unsigned int irq; struct resource resource[DEVICE_COUNT_RESOURCE]; /* I/O and memory regions + expansion ROMs */ + bool match_driver; /* Skip attaching driver */ /* These fields are used by common fixups */ unsigned int transparent:1; /* Transparent PCI bridge */ unsigned int multifunction:1;/* Part of multi-function device */