Skip to content

Commit

Permalink
Input: i8042 - downgrade selftest error message to dbg()
Browse files Browse the repository at this point in the history
On a "really fragile" laptop I noticed a single
    i8042.c: i8042 controller selftest failed. (0x1 != 0x55)

error in the log. But there's no reason to print this message at
KERN_ERR level each time that loop fails, especially since the message
telling about the overall selftest failure is printed at KERN_INFO level
(on X86).

Add an actual error message for non-X86 systems, where a selftest
failure is (apparently) more serious. Remove a space in an another error
message.

Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
  • Loading branch information
Paul Bolle authored and Dmitry Torokhov committed Mar 31, 2011
1 parent 7087486 commit a2a94e7
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions drivers/input/serio/i8042.c
Original file line number Diff line number Diff line change
Expand Up @@ -869,15 +869,15 @@ static int i8042_controller_selftest(void)
do {

if (i8042_command(&param, I8042_CMD_CTL_TEST)) {
pr_err("i8042 controller self test timeout\n");
pr_err("i8042 controller selftest timeout\n");
return -ENODEV;
}

if (param == I8042_RET_CTL_TEST)
return 0;

pr_err("i8042 controller selftest failed. (%#x != %#x)\n",
param, I8042_RET_CTL_TEST);
dbg("i8042 controller selftest: %#x != %#x\n",
param, I8042_RET_CTL_TEST);
msleep(50);
} while (i++ < 5);

Expand All @@ -891,6 +891,7 @@ static int i8042_controller_selftest(void)
pr_info("giving up on controller selftest, continuing anyway...\n");
return 0;
#else
pr_err("i8042 controller selftest failed\n");
return -EIO;
#endif
}
Expand Down

0 comments on commit a2a94e7

Please sign in to comment.