diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-03-17 13:47:14 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-03-17 13:47:14 +0100 |
| commit | 6621c5a69a1dac50852ef09d5cf33154a174805a (patch) | |
| tree | 88f4ff7d73006abcef64f9793daadda9d5034a32 /drivers/acpi/bus.c | |
| parent | Merge branch 'acpi-pci-hotplug' (diff) | |
| parent | Merge branch 'acpi-pci-hotplug' into acpi-hotplug (diff) | |
| download | linux-6621c5a69a1dac50852ef09d5cf33154a174805a.tar.xz linux-6621c5a69a1dac50852ef09d5cf33154a174805a.zip | |
Merge branch 'acpi-hotplug'
* acpi-hotplug:
ACPI / hotplug: Rework deferred execution of acpi_device_hotplug()
ACPI / dock: Update copyright notice
ACPI / dock: Drop remove_dock_dependent_devices()
ACPI / dock: Drop struct acpi_dock_ops and all code related to it
ACPI / ATA: Add hotplug contexts to ACPI companions of SATA devices
ACPI / dock: Add .uevent() callback to struct acpi_hotplug_context
ACPI / dock: Use callback pointers from devices' ACPI hotplug contexts
ACPI / dock: Use ACPI device object pointers instead of ACPI handles
ACPI / hotplug: Add .fixup() callback to struct acpi_hotplug_context
ACPI / hotplug / PCI: Do not clear event callback pointer for docks
ACPI / dock: Associate dock platform devices with ACPI device objects
ACPI / dock: Pass ACPI device pointer to acpi_device_is_battery()
ACPI / dock: Dispatch dock notifications from the global notify handler
Diffstat (limited to 'drivers/acpi/bus.c')
| -rw-r--r-- | drivers/acpi/bus.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c index e61e7b8a2eaf..afe6f9a919c1 100644 --- a/drivers/acpi/bus.c +++ b/drivers/acpi/bus.c @@ -400,7 +400,7 @@ static void acpi_bus_notify(acpi_handle handle, u32 type, void *data) case ACPI_NOTIFY_BUS_CHECK: case ACPI_NOTIFY_DEVICE_CHECK: case ACPI_NOTIFY_EJECT_REQUEST: - status = acpi_hotplug_execute(acpi_device_hotplug, adev, type); + status = acpi_hotplug_schedule(adev, type); if (ACPI_SUCCESS(status)) return; default: |