diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-04-08 14:31:23 +0400 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-04-08 14:31:23 +0400 |
| commit | 408fb7f37bf8e76a22d6058cde7c1f0fc7fa7da9 (patch) | |
| tree | 1352c0be04d06620d7ecfe8b027ee84c2397206f /drivers/acpi/power.c | |
| parent | 31880c37c11e28cb81c70757e38392b42e695dc6 (diff) | |
| parent | fd4655c259fa91b3b207345eb7b4d9faa1b6bc8d (diff) | |
| download | linux-408fb7f37bf8e76a22d6058cde7c1f0fc7fa7da9.tar.xz | |
Merge branch 'acpi-hotplug' into linux-next
* acpi-hotplug:
ACPI / memhotplug: Remove info->failed bit
ACPI / memhotplug: set info->enabled for memory present at boot time
ACPI: Verify device status after eject
acpi: remove reference to ACPI_HOTPLUG_IO
ACPI: Update _OST handling for notify
ACPI: Update PNPID match handling for notify
ACPI: Update PNPID set/free interfaces
ACPI: Remove acpi_device dependency in acpi_device_set_id()
ACPI / hotplug: Make acpi_hotplug_profile_ktype static
ACPI / scan: Make memory hotplug driver use struct acpi_scan_handler
ACPI / container: Use hotplug profile user space interface
ACPI / hotplug: Introduce user space interface for hotplug profiles
ACPI / scan: Introduce acpi_scan_handler_matching()
ACPI / container: Use common hotplug code
ACPI / scan: Introduce common code for ACPI-based device hotplug
ACPI / scan: Introduce acpi_scan_match_handler()
Diffstat (limited to 'drivers/acpi/power.c')
| -rw-r--r-- | drivers/acpi/power.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/power.c b/drivers/acpi/power.c index 34f5ef11d427..0481b1b1d2aa 100644 --- a/drivers/acpi/power.c +++ b/drivers/acpi/power.c @@ -824,7 +824,7 @@ static void acpi_release_power_resource(struct device *dev) list_del(&resource->list_node); mutex_unlock(&power_resource_list_lock); - acpi_free_ids(device); + acpi_free_pnp_ids(&device->pnp); kfree(resource); } |