Commit 13e96214 authored Apr 02, 2019 by Zhang Rui Committed by Rafael J. Wysocki Apr 12, 2019

ACPI: button: reinitialize button state upon resume

With commit dfa46c50 ("ACPI / button: Fix an issue in
button.lid_init_state=ignore mode"), the lid device is considered to be
not compliant to SW_LID if the Lid state is unchanged when updating it.

This is not wrong, but we overlooked the resume case, where Lid state is
updated unconditionally in the button driver .resume() callback. And this
results in warning message "ACPI: button: The lid device is not compliant
to SW_LID." after resume, if the machine is suspended with Lid opened and
then resumed with Lid opened.

Fix this by flushing the cached lid state before updating the Lid device
in .resume() callback.

Fixes: dfa46c50 ("ACPI / button: Fix an issue in button.lid_init_state=ignore mode")
Reported-and-tested-by: Zhao Lijian <lijian.zhao@intel.com>
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

parent 15ade5d2

drivers/acpi/button.c

+4 −1

Original line number	Diff line number	Diff line
		@@ -456,8 +456,11 @@ static int acpi_button_resume(struct device *dev)
		struct acpi_button *button = acpi_driver_data(device);

		button->suspended = false;
		if (button->type == ACPI_BUTTON_TYPE_LID && button->input->users)
		if (button->type == ACPI_BUTTON_TYPE_LID && button->input->users) {
		button->last_state = !!acpi_lid_evaluate_state(device);
		button->last_time = ktime_get();
		acpi_lid_initialize_state(device);
		}
		return 0;
		}
		#endif

Admin message