aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input/serio/at32psif.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/input/serio/at32psif.c')
-rw-r--r--drivers/input/serio/at32psif.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/input/serio/at32psif.c b/drivers/input/serio/at32psif.c
index a6fb7a3dcc46..6ee8f0ddad51 100644
--- a/drivers/input/serio/at32psif.c
+++ b/drivers/input/serio/at32psif.c
@@ -18,6 +18,7 @@
18#include <linux/io.h> 18#include <linux/io.h>
19#include <linux/clk.h> 19#include <linux/clk.h>
20#include <linux/platform_device.h> 20#include <linux/platform_device.h>
21#include <linux/slab.h>
21 22
22/* PSIF register offsets */ 23/* PSIF register offsets */
23#define PSIF_CR 0x00 24#define PSIF_CR 0x00
@@ -137,7 +138,7 @@ static int psif_write(struct serio *io, unsigned char val)
137 spin_lock_irqsave(&psif->lock, flags); 138 spin_lock_irqsave(&psif->lock, flags);
138 139
139 while (!(psif_readl(psif, SR) & PSIF_BIT(TXEMPTY)) && timeout--) 140 while (!(psif_readl(psif, SR) & PSIF_BIT(TXEMPTY)) && timeout--)
140 msleep(10); 141 udelay(50);
141 142
142 if (timeout >= 0) { 143 if (timeout >= 0) {
143 psif_writel(psif, THR, val); 144 psif_writel(psif, THR, val);
@@ -352,6 +353,7 @@ static struct platform_driver psif_driver = {
352 .remove = __exit_p(psif_remove), 353 .remove = __exit_p(psif_remove),
353 .driver = { 354 .driver = {
354 .name = "atmel_psif", 355 .name = "atmel_psif",
356 .owner = THIS_MODULE,
355 }, 357 },
356 .suspend = psif_suspend, 358 .suspend = psif_suspend,
357 .resume = psif_resume, 359 .resume = psif_resume,