summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLan Tianyu <tianyu.lan@intel.com>2014-03-15 13:37:13 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-04-22 16:49:20 -0700
commit48e2fc6d2c59f28ff4f7f55a5fa5fbf4828da350 (patch)
tree3dd966838b298c2fe60e2e78abdb3bc081fd5c36
parent4fa62956a8707dafb9e41921a5b266e8da179586 (diff)
downloadlinux-stable-48e2fc6d2c59f28ff4f7f55a5fa5fbf4828da350.tar.gz
linux-stable-48e2fc6d2c59f28ff4f7f55a5fa5fbf4828da350.tar.bz2
linux-stable-48e2fc6d2c59f28ff4f7f55a5fa5fbf4828da350.zip
ACPI / button: Add ACPI Button event via netlink routine
commit 0bf6368ee8f25826d0645c0f7a4f17c8845356a4 upstream. 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> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/acpi/button.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/acpi/button.c b/drivers/acpi/button.c
index c971929d75c2..ae8ca5c3e458 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)
input_sync(input);
pm_wakeup_event(&device->dev, 0);
+ acpi_bus_generate_netlink_event(
+ device->pnp.device_class,
+ dev_name(&device->dev),
+ event, ++button->pushed);
}
break;
default: