lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'bugzilla-15951' into release

Browse Source
This commit is contained in:
Len Brown
2010-06-17 12:18:30 -04:00
parent c1db9d9bb2 cb1cb1780f
commit 2cebc5e27e
2 changed files with 9 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/acpi/button.c
View File

@@ -425,7 +425,7 @@ static int acpi_button_add(struct acpi_device *device)
/* Button's GPE is run-wake GPE */ /* Button's GPE is run-wake GPE */
acpi_enable_gpe(device->wakeup.gpe_device, acpi_enable_gpe(device->wakeup.gpe_device,
device->wakeup.gpe_number, device->wakeup.gpe_number,
ACPI_GPE_TYPE_WAKE_RUN); ACPI_GPE_TYPE_RUNTIME);
device->wakeup.run_wake_count++; device->wakeup.run_wake_count++;
device->wakeup.state.enabled = 1; device->wakeup.state.enabled = 1;
} }
@@ -449,7 +449,7 @@ static int acpi_button_remove(struct acpi_device *device, int type)
if (device->wakeup.flags.valid) { if (device->wakeup.flags.valid) {
acpi_disable_gpe(device->wakeup.gpe_device, acpi_disable_gpe(device->wakeup.gpe_device,
device->wakeup.gpe_number, device->wakeup.gpe_number,
ACPI_GPE_TYPE_WAKE_RUN); ACPI_GPE_TYPE_RUNTIME);
device->wakeup.run_wake_count--; device->wakeup.run_wake_count--;
device->wakeup.state.enabled = 0; device->wakeup.state.enabled = 0;
} }

20
drivers/acpi/wakeup.c
View File

@@ -64,16 +64,13 @@ void acpi_enable_wakeup_device(u8 sleep_state)
struct acpi_device *dev = struct acpi_device *dev =
container_of(node, struct acpi_device, wakeup_list); container_of(node, struct acpi_device, wakeup_list);
if (!dev->wakeup.flags.valid) if (!dev->wakeup.flags.valid || !dev->wakeup.state.enabled
continue;
if ((!dev->wakeup.state.enabled && !dev->wakeup.prepare_count)
|| sleep_state > (u32) dev->wakeup.sleep_state) || sleep_state > (u32) dev->wakeup.sleep_state)
continue; continue;
/* The wake-up power should have been enabled already. */ /* The wake-up power should have been enabled already. */
acpi_set_gpe(dev->wakeup.gpe_device, dev->wakeup.gpe_number, acpi_enable_gpe(dev->wakeup.gpe_device, dev->wakeup.gpe_number,
ACPI_GPE_ENABLE); ACPI_GPE_TYPE_WAKE);
} }
} }
@@ -96,6 +93,8 @@ void acpi_disable_wakeup_device(u8 sleep_state)
|| (sleep_state > (u32) dev->wakeup.sleep_state)) || (sleep_state > (u32) dev->wakeup.sleep_state))
continue; continue;
acpi_disable_gpe(dev->wakeup.gpe_device, dev->wakeup.gpe_number,
ACPI_GPE_TYPE_WAKE);
acpi_disable_wakeup_device_power(dev); acpi_disable_wakeup_device_power(dev);
} }
} }
@@ -109,13 +108,8 @@ int __init acpi_wakeup_device_init(void)
struct acpi_device *dev = container_of(node, struct acpi_device *dev = container_of(node,
struct acpi_device, struct acpi_device,
wakeup_list); wakeup_list);
/* In case user doesn't load button driver */ if (dev->wakeup.flags.always_enabled)
if (!dev->wakeup.flags.always_enabled || dev->wakeup.state.enabled = 1;
dev->wakeup.state.enabled)
continue;
acpi_enable_gpe(dev->wakeup.gpe_device, dev->wakeup.gpe_number,
ACPI_GPE_TYPE_WAKE);
dev->wakeup.state.enabled = 1;
} }
mutex_unlock(&acpi_device_lock); mutex_unlock(&acpi_device_lock);
return 0; return 0;