diff options
Diffstat (limited to 'drivers/acpi/power.c')
-rw-r--r-- | drivers/acpi/power.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/acpi/power.c b/drivers/acpi/power.c index 0003f1009885..ac02af419b32 100644 --- a/drivers/acpi/power.c +++ b/drivers/acpi/power.c | |||
@@ -219,7 +219,7 @@ static int acpi_power_on(acpi_handle handle) | |||
219 | return result; | 219 | return result; |
220 | } | 220 | } |
221 | 221 | ||
222 | static int acpi_power_off_device(acpi_handle handle) | 222 | static int acpi_power_off(acpi_handle handle) |
223 | { | 223 | { |
224 | int result = 0; | 224 | int result = 0; |
225 | acpi_status status = AE_OK; | 225 | acpi_status status = AE_OK; |
@@ -268,7 +268,7 @@ static void __acpi_power_off_list(struct acpi_handle_list *list, int num_res) | |||
268 | int i; | 268 | int i; |
269 | 269 | ||
270 | for (i = num_res - 1; i >= 0 ; i--) | 270 | for (i = num_res - 1; i >= 0 ; i--) |
271 | acpi_power_off_device(list->handles[i]); | 271 | acpi_power_off(list->handles[i]); |
272 | } | 272 | } |
273 | 273 | ||
274 | static void acpi_power_off_list(struct acpi_handle_list *list) | 274 | static void acpi_power_off_list(struct acpi_handle_list *list) |
@@ -430,8 +430,7 @@ int acpi_disable_wakeup_device_power(struct acpi_device *dev) | |||
430 | 430 | ||
431 | /* Close power resource */ | 431 | /* Close power resource */ |
432 | for (i = 0; i < dev->wakeup.resources.count; i++) { | 432 | for (i = 0; i < dev->wakeup.resources.count; i++) { |
433 | int ret = acpi_power_off_device( | 433 | int ret = acpi_power_off(dev->wakeup.resources.handles[i]); |
434 | dev->wakeup.resources.handles[i]); | ||
435 | if (ret) { | 434 | if (ret) { |
436 | printk(KERN_ERR PREFIX "Transition power state\n"); | 435 | printk(KERN_ERR PREFIX "Transition power state\n"); |
437 | dev->wakeup.flags.valid = 0; | 436 | dev->wakeup.flags.valid = 0; |