Merge tag 'pci-v3.9-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci

[pandora-kernel.git] / drivers / pci / hotplug / acpiphp_glue.c

diff --git a/drivers/pci/hotplug/acpiphp_glue.c b/drivers/pci/hotplug/acpiphp_glue.c
index 4681d2c..270fdba 100644 (file)
--- a/drivers/pci/hotplug/acpiphp_glue.c
+++ b/drivers/pci/hotplug/acpiphp_glue.c
@@ -724,8 +724,7 @@ static int acpiphp_bus_add(struct acpiphp_func *func)
                /* this shouldn't be in here, so remove
                 * the bus then re-add it...
                 */
-               ret_val = acpi_bus_trim(device);
-               dbg("acpi_bus_trim return %x\n", ret_val);
+               acpi_bus_trim(device);
        }
 
        ret_val = acpi_bus_scan(func->handle);
@@ -754,11 +753,8 @@ static int acpiphp_bus_trim(acpi_handle handle)
                return retval;
        }
 
-       retval = acpi_bus_trim(device);
-       if (retval)
-               err("cannot remove from acpi list\n");
-
-       return retval;
+       acpi_bus_trim(device);
+       return 0;
 }
 
 static void acpiphp_set_acpi_region(struct acpiphp_slot *slot)
@@ -1141,6 +1137,8 @@ static void _handle_hotplug_event_bridge(struct work_struct *work)
        type = hp_work->type;
        bridge = (struct acpiphp_bridge *)hp_work->context;
 
+       acpi_scan_lock_acquire();
+
        acpi_get_name(handle, ACPI_FULL_PATHNAME, &buffer);
 
        switch (type) {
@@ -1195,6 +1193,7 @@ static void _handle_hotplug_event_bridge(struct work_struct *work)
                break;
        }
 
+       acpi_scan_lock_release();
        kfree(hp_work); /* allocated in handle_hotplug_event_bridge */
 }
 
@@ -1235,6 +1234,8 @@ static void _handle_hotplug_event_func(struct work_struct *work)
        type = hp_work->type;
        func = (struct acpiphp_func *)hp_work->context;
 
+       acpi_scan_lock_acquire();
+
        acpi_get_name(handle, ACPI_FULL_PATHNAME, &buffer);
 
        switch (type) {
@@ -1267,6 +1268,7 @@ static void _handle_hotplug_event_func(struct work_struct *work)
                break;
        }
 
+       acpi_scan_lock_release();
        kfree(hp_work); /* allocated in handle_hotplug_event_func */
 }