diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-12-15 07:47:20 +0100 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-12-15 09:35:08 +0100 |
| commit | e47c4f70ea41fd973eec80a9388a1347d3d27896 (patch) | |
| tree | baf261863ea13ccee04e2c150b68abb7034e2546 /drivers/input | |
| parent | Input: i8042 - add Gigabyte M1022M to the noloop list (diff) | |
| download | linux-e47c4f70ea41fd973eec80a9388a1347d3d27896.tar.xz linux-e47c4f70ea41fd973eec80a9388a1347d3d27896.zip | |
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.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/serio/at32psif.c b/drivers/input/serio/at32psif.c index 50bdc00c49d7..b54452a8c771 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); |