aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcos Paulo de Souza <marcos.souza.org@gmail.com>2017-01-22 17:29:22 -0500
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2017-01-22 17:32:35 -0500
commit2ea9c2362b562e227a944e0ae370c9868024884e (patch)
tree62274f6f2bc65a967e52a600db360a911f32ca7c
parenta5e5da2b6f129d2a4f7a3f0b73dba2f6f63208ef (diff)
Input: i8042 - add dbg msg when a command can't write its parameter
This can happen in cases like bug #102951[1], so add a proper debug msg as done in wait_read. Also, change wait_read debug message to differ from wait_write. [1] https://bugzilla.kernel.org/show_bug.cgi?id=102951 Signed-off-by: Marcos Paulo de Souza <marcos.souza.org@gmail.com> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
-rw-r--r--drivers/input/serio/i8042.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/input/serio/i8042.c b/drivers/input/serio/i8042.c
index 62685a768913..c52da651269b 100644
--- a/drivers/input/serio/i8042.c
+++ b/drivers/input/serio/i8042.c
@@ -312,8 +312,10 @@ static int __i8042_command(unsigned char *param, int command)
312 312
313 for (i = 0; i < ((command >> 12) & 0xf); i++) { 313 for (i = 0; i < ((command >> 12) & 0xf); i++) {
314 error = i8042_wait_write(); 314 error = i8042_wait_write();
315 if (error) 315 if (error) {
316 dbg(" -- i8042 (wait write timeout)\n");
316 return error; 317 return error;
318 }
317 dbg("%02x -> i8042 (parameter)\n", param[i]); 319 dbg("%02x -> i8042 (parameter)\n", param[i]);
318 i8042_write_data(param[i]); 320 i8042_write_data(param[i]);
319 } 321 }
@@ -321,7 +323,7 @@ static int __i8042_command(unsigned char *param, int command)
321 for (i = 0; i < ((command >> 8) & 0xf); i++) { 323 for (i = 0; i < ((command >> 8) & 0xf); i++) {
322 error = i8042_wait_read(); 324 error = i8042_wait_read();
323 if (error) { 325 if (error) {
324 dbg(" -- i8042 (timeout)\n"); 326 dbg(" -- i8042 (wait read timeout)\n");
325 return error; 327 return error;
326 } 328 }
327 329