diff options
| author |   Benjamin Tissoires <benjamin.tissoires@redhat.com> | 2014-09-02 14:04:19 -0400 |
|---|---|---|
| committer |   Darren Hart <dvhart@linux.intel.com> | 2014-09-02 15:45:36 -0700 |
| commit | e7fdb762b9e1e10c3271e47723b2003330829ddf (patch) | |
| tree | cf9d0c4c12967f13586c4f44dfa701f46d18234b /drivers/platform | |
| parent | ideapad-laptop: Constify DMI table for real! (diff) | |
| download | linux-dev-e7fdb762b9e1e10c3271e47723b2003330829ddf.tar.xz linux-dev-e7fdb762b9e1e10c3271e47723b2003330829ddf.zip | |
platform/x86: toshiba: re-enable acpi hotkeys after suspend to disk
On the Toshiba Tecra Z40, after a suspend-to-disk, some FN hotkeys
driven by toshiba_acpi are not functional.
Calling the ACPI object ENAB on resume makes them back alive.
Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Acked-by: Matthew Garrett <matthew.garrett@nebula.com>
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
Diffstat (limited to 'drivers/platform')
| -rw-r--r-- | drivers/platform/x86/toshiba_acpi.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/platform/x86/toshiba_acpi.c b/drivers/platform/x86/toshiba_acpi.c index b062d3d7b373..ba75701986e5 100644 --- a/drivers/platform/x86/toshiba_acpi.c +++ b/drivers/platform/x86/toshiba_acpi.c @@ -1857,9 +1857,16 @@ static int toshiba_acpi_resume(struct device *device) { struct toshiba_acpi_dev *dev = acpi_driver_data(to_acpi_device(device)); u32 result; + acpi_status status; + + if (dev->hotkey_dev) { + status = acpi_evaluate_object(dev->acpi_dev->handle, "ENAB", + NULL, NULL); + if (ACPI_FAILURE(status)) + pr_info("Unable to re-enable hotkeys\n"); - if (dev->hotkey_dev) hci_write1(dev, HCI_HOTKEY_EVENT, HCI_HOTKEY_ENABLE, &result); + } return 0; } |