Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs

[pandora-kernel.git] / drivers / input / serio / i8042.c

diff --git a/drivers/input/serio/i8042.c b/drivers/input/serio/i8042.c
index ac4c936..d37a48e 100644 (file)
--- a/drivers/input/serio/i8042.c
+++ b/drivers/input/serio/i8042.c
@@ -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);
 
@@ -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
 }