summaryrefslogtreecommitdiffstats
path: root/drivers/input
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2009-12-14 22:47:20 -0800
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2009-12-15 00:35:08 -0800
commite47c4f70ea41fd973eec80a9388a1347d3d27896 (patch)
treebaf261863ea13ccee04e2c150b68abb7034e2546 /drivers/input
parenta61cd03827eceefcec19eefc6e1173703fdc5e5d (diff)
downloadop-kernel-dev-e47c4f70ea41fd973eec80a9388a1347d3d27896.zip
op-kernel-dev-e47c4f70ea41fd973eec80a9388a1347d3d27896.tar.gz
Input: at32psif - do not sleep in atomic context
We can't use msleep() while holding a spinlock, moreower serio's write() method is supposed to be useable from inettrupt context. Let's do what i8042 does and poll the status register every 50 us (with udelay). Reported-by: Marjan Fojkar <marjan@pajkc.eu> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/input')
-rw-r--r--drivers/input/serio/at32psif.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/serio/at32psif.c b/drivers/input/serio/at32psif.c
index 50bdc00..b54452a 100644
--- a/drivers/input/serio/at32psif.c
+++ b/drivers/input/serio/at32psif.c
@@ -137,7 +137,7 @@ static int psif_write(struct serio *io, unsigned char val)
spin_lock_irqsave(&psif->lock, flags);
while (!(psif_readl(psif, SR) & PSIF_BIT(TXEMPTY)) && timeout--)
- msleep(10);
+ udelay(50);
if (timeout >= 0) {
psif_writel(psif, THR, val);
OpenPOWER on IntegriCloud