diff options
| author |  Rafael J. Wysocki <rafael.j.wysocki@intel.com>
| 2013-12-31 13:41:08 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com>
| 2013-12-31 13:41:08 +0100 |
| commit | d1badf8d4323cfc9325b06651bdfcf7df09f1f0e (patch) | |
| tree | 08a8a8dab1955bb07724028ece639267502a07ba /drivers/acpi/bus.c | |
| parent | ACPI / hotplug / driver core: Handle containers in a special way (diff) | |
| parent | ACPIPHP / radeon / nouveau: Fix VGA switcheroo problem related to hotplug (diff) | |
| download | linux-d1badf8d4323cfc9325b06651bdfcf7df09f1f0e.tar.gz linux-d1badf8d4323cfc9325b06651bdfcf7df09f1f0e.tar.bz2 linux-d1badf8d4323cfc9325b06651bdfcf7df09f1f0e.zip | |
Merge branch 'acpi-pci-hotplug' into acpi-hotplug
Conflicts:
include/acpi/acpi_bus.h
Diffstat (limited to 'drivers/acpi/bus.c')
| -rw-r--r-- | drivers/acpi/bus.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c index 2c38ae22c17f..384da5ab5955 100644 --- a/drivers/acpi/bus.c +++ b/drivers/acpi/bus.c @@ -149,6 +149,16 @@ int acpi_bus_get_private_data(acpi_handle handle, void **data) } EXPORT_SYMBOL(acpi_bus_get_private_data); +void acpi_bus_no_hotplug(acpi_handle handle) +{ + struct acpi_device *adev = NULL; + + acpi_bus_get_device(handle, &adev); + if (adev) + adev->flags.no_hotplug = true; +} +EXPORT_SYMBOL_GPL(acpi_bus_no_hotplug); + static void acpi_print_osc_error(acpi_handle handle, struct acpi_osc_context *context, char *error) { |