Don't try to attach a driver to a pci device that already has one.

diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c
index 4055c7580993b527cb79f6311674e99f07e13b2a..e609a22cf13ce538548821c8635b8f1474ff19e7 100644 (file)
--- a/drivers/pci/pci-driver.c
+++ b/drivers/pci/pci-driver.c
@@ -44,7 +44,7 @@ static int pci_device_probe(struct device * dev)
        drv = to_pci_driver(dev->driver);
        pci_dev = to_pci_dev(dev);
 
-       if (drv->probe) {
+       if (!pci_dev->driver && drv->probe) {
                const struct pci_device_id *id;
 
                id = pci_match_device(drv->id_table, pci_dev);