From 987cabaa3cdf4b43b645b0232784c394da7f15c7 Mon Sep 17 00:00:00 2001 From: Christoph Hellwig Date: Fri, 17 Jun 2005 12:25:25 -0700 Subject: [PATCH] --- yaml --- r: 2014 b: refs/heads/master c: 794f5bfa77955c4455f6d72d8b0e2bee25f1ff0c h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/pci/pci-driver.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index ec1ef6077392..fbf7e32a0b5d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: caf2857ac6e0ba2651e722f05d5f7d3ec8ef2615 +refs/heads/master: 794f5bfa77955c4455f6d72d8b0e2bee25f1ff0c diff --git a/trunk/drivers/pci/pci-driver.c b/trunk/drivers/pci/pci-driver.c index fe98553c978f..f315df2005bc 100644 --- a/trunk/drivers/pci/pci-driver.c +++ b/trunk/drivers/pci/pci-driver.c @@ -393,7 +393,10 @@ int pci_register_driver(struct pci_driver *drv) drv->driver.bus = &pci_bus_type; drv->driver.probe = pci_device_probe; drv->driver.remove = pci_device_remove; - drv->driver.shutdown = pci_device_shutdown, + /* FIXME, once all of the existing PCI drivers have been fixed to set + * the pci shutdown function, this test can go away. */ + if (!drv->driver.shutdown) + drv->driver.shutdown = pci_device_shutdown, drv->driver.owner = drv->owner; drv->driver.kobj.ktype = &pci_driver_kobj_type; pci_init_dynids(&drv->dynids);