From: Benjamin Berg Date: Tue, 14 Nov 2017 16:14:14 +0000 (+0100) Subject: platform/x86: thinkpad_acpi: Accept flat mode for type 4 multi mode status X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=26befef00eb2ae37939a189a5d03c4c7b600e6f9;p=linux.git platform/x86: thinkpad_acpi: Accept flat mode for type 4 multi mode status On the X1 Yoga 2nd Generation and most likely other notebooks the FLAT mode is reported. Decode it correctly rather than warning about an unexpected multi mode status to be reported. Signed-off-by: Benjamin Berg Cc: Peter FP1 Zhang Reviewed-by: Lyude Paul Signed-off-by: Andy Shevchenko --- diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c index 117be48ff4de9..7dcbd97710a9a 100644 --- a/drivers/platform/x86/thinkpad_acpi.c +++ b/drivers/platform/x86/thinkpad_acpi.c @@ -2113,12 +2113,10 @@ static int hotkey_gmms_get_tablet_mode(int s, int *has_tablet_mode) TP_ACPI_MULTI_MODE_FLAT; break; case 4: - valid_modes = TP_ACPI_MULTI_MODE_LAPTOP | - TP_ACPI_MULTI_MODE_TABLET | - TP_ACPI_MULTI_MODE_STAND | - TP_ACPI_MULTI_MODE_TENT; - break; case 5: + /* In mode 4, FLAT is not specified as a valid mode. However, + * it can be seen at least on the X1 Yoga 2nd Generation. + */ valid_modes = TP_ACPI_MULTI_MODE_LAPTOP | TP_ACPI_MULTI_MODE_FLAT | TP_ACPI_MULTI_MODE_TABLET |