summaryrefslogtreecommitdiffstats
path: root/drivers/pci
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2015-04-13 12:57:12 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2015-04-13 12:57:12 +0200
commit4e1ac4a8729693cfe474a1d68c5e07a6d6a9eaa5 (patch)
tree97170068fad36ce95d01737a80dfbfcb5023cfc0 /drivers/pci
parent909dbe5334d54a5538128ebf18391608315c2f9a (diff)
parent80264a8ac4ab878bb0d3ebe7f6552f2203549b78 (diff)
downloadbarebox-4e1ac4a8729693cfe474a1d68c5e07a6d6a9eaa5.tar.gz
barebox-4e1ac4a8729693cfe474a1d68c5e07a6d6a9eaa5.tar.xz
Merge branch 'for-next/driver'
Diffstat (limited to 'drivers/pci')
-rw-r--r--drivers/pci/bus.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/pci/bus.c b/drivers/pci/bus.c
index 866ab08067..d6c5496ad7 100644
--- a/drivers/pci/bus.c
+++ b/drivers/pci/bus.c
@@ -51,7 +51,8 @@ static void pci_remove(struct device_d *dev)
struct pci_dev *pdev = to_pci_dev(dev);
struct pci_driver *pdrv = to_pci_driver(dev->driver);
- pdrv->remove(pdev);
+ if (pdrv->remove)
+ pdrv->remove(pdev);
}
struct bus_type pci_bus = {