aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2018-02-28 12:10:59 +0100
committerAndy Shevchenko <andriy.shevchenko@linux.intel.com>2018-03-01 13:08:25 +0200
commit38c08aa54b50640302a6529f4b6eb441b3bfc5dd (patch)
tree75eaca8f4943ba1a2d986675e7b934151434323d
parentplatform/x86: intel-vbtn: Reset wakeup capable flag on removal (diff)
downloadlinux-dev-38c08aa54b50640302a6529f4b6eb441b3bfc5dd.tar.xz
linux-dev-38c08aa54b50640302a6529f4b6eb441b3bfc5dd.zip
platform/x86: intel-hid: Reset wakeup capable flag on removal
The intel-hid device will not be able to wake up the system any more after removing the notify handler provided by its driver, so make its sysfs attributes reflect that. Fixes: ef884112e55c (platform: x86: intel-hid: Wake up the system from suspend-to-idle) Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
-rw-r--r--drivers/platform/x86/intel-hid.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/platform/x86/intel-hid.c b/drivers/platform/x86/intel-hid.c
index d1a01311c1a2..5e3df194723e 100644
--- a/drivers/platform/x86/intel-hid.c
+++ b/drivers/platform/x86/intel-hid.c
@@ -376,6 +376,7 @@ static int intel_hid_remove(struct platform_device *device)
{
acpi_handle handle = ACPI_HANDLE(&device->dev);
+ device_init_wakeup(&device->dev, false);
acpi_remove_notify_handler(handle, ACPI_DEVICE_NOTIFY, notify_handler);
intel_hid_set_enable(&device->dev, false);
intel_button_array_enable(&device->dev, false);