Commit d19bdb87 authored Aug 08, 2019 by Rafael J. Wysocki

intel-hid: Disable button array during suspend-to-idle

Notice that intel_button_array_enable() never disables the power
button which is the only one needed to wake up the system from
suspend-to-idle, so it can be safely called during suspend-to-idle
as well as during "regular" system suspend, and rearrange the
code in the driver's "suspend" and "resume" callbacks accordingly.

While at it, use pm_suspend_no_platform() to check if the current
suspend-resume cycle is suspend-to-idle, as that is the only
case when the device should be enabled while suspended.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>

parent 31eb8457

drivers/platform/x86/intel-hid.c

+7 −6

Original line number	Diff line number	Diff line
		@@ -274,10 +274,11 @@ static void intel_hid_pm_complete(struct device *device)

		static int intel_hid_pl_suspend_handler(struct device *device)
		{
		if (pm_suspend_via_firmware()) {
		intel_hid_set_enable(device, false);
		intel_button_array_enable(device, false);
		}

		if (!pm_suspend_no_platform())
		intel_hid_set_enable(device, false);

		return 0;
		}

		@@ -285,10 +286,10 @@ static int intel_hid_pl_resume_handler(struct device *device)
		{
		intel_hid_pm_complete(device);

		if (pm_resume_via_firmware()) {
		if (!pm_suspend_no_platform())
		intel_hid_set_enable(device, true);

		intel_button_array_enable(device, true);
		}
		return 0;
		}

Admin message