lgtm. Reviewed-by: Lyude Paul <[email protected]>
On Tue, 2017-11-14 at 17:14 +0100, Benjamin Berg wrote: > 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 <[email protected]> > Cc: Peter FP1 Zhang <[email protected] > Cc: Lyude <[email protected]> > --- > drivers/platform/x86/thinkpad_acpi.c | 8 +++----- > 1 file changed, 3 insertions(+), 5 deletions(-) > > diff --git a/drivers/platform/x86/thinkpad_acpi.c > b/drivers/platform/x86/thinkpad_acpi.c > index 91fab1a13a6d..d23c84222e9f 100644 > --- a/drivers/platform/x86/thinkpad_acpi.c > +++ b/drivers/platform/x86/thinkpad_acpi.c > @@ -2106,26 +2106,24 @@ static int hotkey_gmms_get_tablet_mode(int s, int > *has_tablet_mode) > TP_ACPI_MULTI_MODE_FLAT | > TP_ACPI_MULTI_MODE_TABLET | > TP_ACPI_MULTI_MODE_STAND | > TP_ACPI_MULTI_MODE_TENT; > break; > case 3: > valid_modes = TP_ACPI_MULTI_MODE_LAPTOP | > 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 | > TP_ACPI_MULTI_MODE_STAND | > TP_ACPI_MULTI_MODE_TENT; > break; > default: > pr_err("Unknown multi mode status type %d with value > 0x%04X, please report this to %s\n", > type, value, TPACPI_MAIL); > return 0; ------------------------------------------------------------------------------ Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot _______________________________________________ ibm-acpi-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/ibm-acpi-devel
