projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/j.anaszewski...
[linux-2.6-block.git]
/
drivers
/
pci
/
bus.c
diff --git
a/drivers/pci/bus.c
b/drivers/pci/bus.c
index 23a39fdc311ed33d9a075b0a96fdd580bcdce771..dd7cdbee8029d5a51a60c63bb24a5772c0b84de9 100644
(file)
--- a/
drivers/pci/bus.c
+++ b/
drivers/pci/bus.c
@@
-294,7
+294,7
@@
void pci_bus_add_device(struct pci_dev *dev)
dev->match_driver = true;
retval = device_attach(&dev->dev);
- if (retval < 0) {
+ if (retval < 0
&& retval != -EPROBE_DEFER
) {
dev_warn(&dev->dev, "device attach failed (%d)\n", retval);
pci_proc_detach_device(dev);
pci_remove_sysfs_dev_files(dev);