From: AceLan Kao <acelan.kao@canonical.com>
To: Dmitry Torokhov <dmitry.torokhov@gmail.com>,
"Rafael J. Wysocki" <rafael.j.wysocki@intel.com>,
Thomas Gleixner <tglx@linutronix.de>,
Allison Randal <allison@lohutok.net>,
Enrico Weigelt <info@metux.net>,
Stephen Boyd <swboyd@chromium.org>,
linux-input@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH] Input: i8042 - Fix the selftest retry logic
Date: Thu, 5 Mar 2020 14:44:23 +0800 [thread overview]
Message-ID: <20200305064423.16196-1-acelan.kao@canonical.com> (raw)
It returns -NODEV at the first selftest timeout, so the retry logic
doesn't work. Move the return outside of the while loop to make it real
retry 5 times before returns -ENODEV.
BTW, the origin loop will retry 6 times, also fix this.
Signed-off-by: AceLan Kao <acelan.kao@canonical.com>
---
drivers/input/serio/i8042.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/drivers/input/serio/i8042.c b/drivers/input/serio/i8042.c
index 20ff2bed3917..3f6433a5c8e6 100644
--- a/drivers/input/serio/i8042.c
+++ b/drivers/input/serio/i8042.c
@@ -944,10 +944,9 @@ static int i8042_controller_selftest(void)
*/
do {
- if (i8042_command(¶m, I8042_CMD_CTL_TEST)) {
- pr_err("i8042 controller selftest timeout\n");
- return -ENODEV;
- }
+ if (i8042_command(¶m, I8042_CMD_CTL_TEST))
+ pr_err("i8042 controller selftest timeout (%d/5)\n",
+ i+1);
if (param == I8042_RET_CTL_TEST)
return 0;
@@ -955,7 +954,9 @@ static int i8042_controller_selftest(void)
dbg("i8042 controller selftest: %#x != %#x\n",
param, I8042_RET_CTL_TEST);
msleep(50);
- } while (i++ < 5);
+ } while (++i < 5);
+ if (i == 5)
+ return -ENODEV;
#ifdef CONFIG_X86
/*
--
2.17.1
next reply other threads:[~2020-03-05 6:44 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-05 6:44 AceLan Kao [this message]
2020-03-06 4:16 ` [PATCH] Input: i8042 - Fix the selftest retry logic Dmitry Torokhov
2020-03-06 6:40 ` AceLan Kao
2020-03-10 3:35 ` You-Sheng Yang
2020-03-10 3:36 ` [PATCH v2] Input: i8042 - fix " You-Sheng Yang
2020-03-17 4:22 ` AceLan Kao
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200305064423.16196-1-acelan.kao@canonical.com \
--to=acelan.kao@canonical.com \
--cc=allison@lohutok.net \
--cc=dmitry.torokhov@gmail.com \
--cc=info@metux.net \
--cc=linux-input@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=rafael.j.wysocki@intel.com \
--cc=swboyd@chromium.org \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).