diff options
author | Lan Tianyu <tianyu.lan@intel.com> | 2014-03-15 13:37:13 -0400 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-03-18 21:06:15 -0400 |
commit | 0bf6368ee8f25826d0645c0f7a4f17c8845356a4 (patch) | |
tree | 389a2b2f9f0eb8e7d69433078771c2807e3950c8 /drivers/acpi/button.c | |
parent | dcb99fd9b08cfe1afe426af4d8d3cbc429190f15 (diff) |
ACPI / button: Add ACPI Button event via netlink routine
Commit 1696d9d (ACPI: Remove the old /proc/acpi/event interface)
removed ACPI Button event which originally was sent to userspace via
/proc/acpi/event. This caused ACPI shutdown regression on gentoo
in VirtualBox. Now ACPI events are sent to userspace via netlink,
so add ACPI Button event back via netlink routine.
References: https://bugzilla.kernel.org/show_bug.cgi?id=71721
Reported-and-tested-by: Richard Musil <richard.musil@gmail.com>
Signed-off-by: Lan Tianyu <tianyu.lan@intel.com>
Cc: 3.11+ <stable@vger.kernel.org> # 3.11+
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/acpi/button.c')
-rw-r--r-- | drivers/acpi/button.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/acpi/button.c b/drivers/acpi/button.c index 714e957a871a..db35594d4df7 100644 --- a/drivers/acpi/button.c +++ b/drivers/acpi/button.c | |||
@@ -302,6 +302,10 @@ static void acpi_button_notify(struct acpi_device *device, u32 event) | |||
302 | input_sync(input); | 302 | input_sync(input); |
303 | 303 | ||
304 | pm_wakeup_event(&device->dev, 0); | 304 | pm_wakeup_event(&device->dev, 0); |
305 | acpi_bus_generate_netlink_event( | ||
306 | device->pnp.device_class, | ||
307 | dev_name(&device->dev), | ||
308 | event, ++button->pushed); | ||
305 | } | 309 | } |
306 | break; | 310 | break; |
307 | default: | 311 | default: |