1 files changed, 6 insertions, 1 deletions

diff --git a/drivers/pci/hotplug/acpiphp_core.c b/drivers/pci/hotplug/acpiphp_core.c
index 60c4c38047a3..bce71c933478 100644
--- a/drivers/pci/hotplug/acpiphp_core.c
+++ b/drivers/pci/hotplug/acpiphp_core.c
@@ -429,14 +429,17 @@ static void __exit cleanup_slots (void)
 static int __init acpiphp_init(void)
 {
         int retval;
+        int docking_station;
 
         info(DRIVER_DESC " version: " DRIVER_VERSION "\n");
 
         acpiphp_debug = debug;
 
+        docking_station = find_dock_station();
+
         /* read all the ACPI info from the system */
         retval = init_acpi();
-        if (retval)
+        if (retval && !(docking_station))
                 return retval;
 
         return init_slots();
@@ -448,6 +451,8 @@ static void __exit acpiphp_exit(void)
         cleanup_slots();
         /* deallocate internal data structures etc. */
         acpiphp_glue_exit();
+
+        remove_dock_station();
 }
 
 module_init(acpiphp_init);