Make new quirk table easily debugable with some debug output.
With no functional change, evaluation of i8042_reset_quirk and
i8042_reset_never_quirk had to be moved for this.
Signed-off-by: Werner Sembach <wse@xxxxxxxxxxxxxxxxxxx>
Cc: stable@xxxxxxxxxxxxxxx
---
drivers/input/serio/i8042-x86ia64io.h | 33 +++++++++++++++++++--------
1 file changed, 24 insertions(+), 9 deletions(-)
diff --git a/drivers/input/serio/i8042-x86ia64io.h b/drivers/input/serio/i8042-x86ia64io.h
index 689b9ee3e742..e41b0819277c 100644
--- a/drivers/input/serio/i8042-x86ia64io.h
+++ b/drivers/input/serio/i8042-x86ia64io.h
@@ -1471,6 +1471,30 @@ static int __init i8042_platform_init(void)
i8042_nopnp = true;
#endif
}
+ /* Honor module parameter when value is not default */
+ if (i8042_reset == I8042_RESET_DEFAULT) {
+ if (i8042_reset_always_quirk)
+ i8042_reset = I8042_RESET_ALWAYS;
+
+ if (i8042_reset_never_quirk)
+ i8042_reset = I8042_RESET_NEVER;
+ }
+ pr_debug("Active quirks:%s%s%s%s%s%s%s%s%s%s%s%s%s\n",
+ i8042_nokbd ? " nokbd" : "",
+ i8042_noaux ? " noaux" : "",
+ i8042_nomux ? " nomux" : "",
+ i8042_unlock ? " unlock" : "",
+ i8042_probe_defer ? "probe_defer" : "",
+ i8042_reset == I8042_RESET_DEFAULT ?
+ "" : i8042_reset == I8042_RESET_ALWAYS ?
+ " reset_always" : " reset_never",
+ i8042_direct ? " direct" : "",
+ i8042_dumbkbd ? " dumbkbd" : "",
+ i8042_noloop ? " noloop" : "",
+ i8042_notimeout ? " notimeout" : "",
+ i8042_kbdreset ? " kbdreset" : "",
+ i8042_dritek ? " dritek" : "",
+ i8042_nopnp ? " nopnp" : "");
#endif
retval = i8042_pnp_init();
@@ -1482,15 +1506,6 @@ static int __init i8042_platform_init(void)
#endif
#ifdef CONFIG_X86
- /* Honor module parameter when value is not default */
- if (i8042_reset == I8042_RESET_DEFAULT) {
- if (i8042_reset_always_quirk)
- i8042_reset = I8042_RESET_ALWAYS;
-
- if (i8042_reset_never_quirk)
- i8042_reset = I8042_RESET_NEVER;
- }
-
/*
* A20 was already enabled during early kernel init. But some buggy
* BIOSes (in MSI Laptops) require A20 to be enabled using 8042 to
--
2.25.1
