summaryrefslogtreecommitdiffstats
path: root/drivers/input
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@armlinux.org.uk>2017-09-26 09:57:12 -0700
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2017-09-26 11:52:08 -0700
commit361fa055f1ef475ca9f9bdf88884fd128273366e (patch)
tree5be074284620e0f9de36ab82571cd0be6954cdd5 /drivers/input
parenta12ded48b3e67f9d6180002b208de5b12e39e6f0 (diff)
downloadlinux-stable-361fa055f1ef475ca9f9bdf88884fd128273366e.tar.gz
linux-stable-361fa055f1ef475ca9f9bdf88884fd128273366e.tar.bz2
linux-stable-361fa055f1ef475ca9f9bdf88884fd128273366e.zip
Input: sa1111ps2 - extend test delay
A 2us delay is too small for the bus to settle after writing to the register. Extend to 10us which gives more reliable results. Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers/input')
-rw-r--r--drivers/input/serio/sa1111ps2.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/serio/sa1111ps2.c b/drivers/input/serio/sa1111ps2.c
index f1c036260d25..f9e5c793f4f0 100644
--- a/drivers/input/serio/sa1111ps2.c
+++ b/drivers/input/serio/sa1111ps2.c
@@ -212,7 +212,7 @@ static unsigned int ps2_test_one(struct ps2if *ps2if,
writel_relaxed(PS2CR_ENA | mask, ps2if->base + PS2CR);
- udelay(2);
+ udelay(10);
val = readl_relaxed(ps2if->base + PS2STAT);
return val & (PS2STAT_KBC | PS2STAT_KBD);