summaryrefslogtreecommitdiffstats
path: root/drivers/pci
diff options
context:
space:
mode:
authorAkinobu Mita <akinobu.mita@gmail.com>2006-10-30 13:08:04 -0800
committerGreg Kroah-Hartman <gregkh@suse.de>2006-12-01 14:36:58 -0800
commit0a9dee2739fd4385e83c3316e3f3bee641796638 (patch)
tree0939f843f1881745ded480b4fa1ae9dec72350cc /drivers/pci
parent467c442f092e22acf86a3b4ad4863d097d7257da (diff)
downloadop-kernel-dev-0a9dee2739fd4385e83c3316e3f3bee641796638.zip
op-kernel-dev-0a9dee2739fd4385e83c3316e3f3bee641796638.tar.gz
acpiphp: fix missing acpiphp_glue_exit()
acpiphp_glue_exit() needs to be called to unwind when no slots found. (It fixes data corruption when reloading acpiphp driver with no such devices) Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com> Signed-off-by: Kristen Carlson Accardi <kristen.c.accardi@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/pci')
-rw-r--r--drivers/pci/hotplug/acpiphp_core.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/pci/hotplug/acpiphp_core.c b/drivers/pci/hotplug/acpiphp_core.c
index c57d9d5c..c8b6907 100644
--- a/drivers/pci/hotplug/acpiphp_core.c
+++ b/drivers/pci/hotplug/acpiphp_core.c
@@ -303,8 +303,10 @@ static int __init init_acpi(void)
/* read initial number of slots */
if (!retval) {
num_slots = acpiphp_get_num_slots();
- if (num_slots == 0)
+ if (num_slots == 0) {
+ acpiphp_glue_exit();
retval = -ENODEV;
+ }
}
return retval;
OpenPOWER on IntegriCloud