OSDN Git Service
(root)
/
uclinux-h8
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branches 'acpi-video' and 'acpi-hotplug'
[uclinux-h8/linux.git]
/
drivers
/
pci
/
hotplug
/
acpiphp_glue.c
diff --git
a/drivers/pci/hotplug/acpiphp_glue.c
b/drivers/pci/hotplug/acpiphp_glue.c
index
5f2fda1
..
fa49f91
100644
(file)
--- a/
drivers/pci/hotplug/acpiphp_glue.c
+++ b/
drivers/pci/hotplug/acpiphp_glue.c
@@
-953,8
+953,10
@@
int acpiphp_enable_slot(struct acpiphp_slot *slot)
{
pci_lock_rescan_remove();
- if (slot->flags & SLOT_IS_GOING_AWAY)
+ if (slot->flags & SLOT_IS_GOING_AWAY) {
+ pci_unlock_rescan_remove();
return -ENODEV;
+ }
/* configure all functions */
if (!(slot->flags & SLOT_ENABLED))