Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master

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 @@
 #include <linux/io.h>
 #include <linux/clk.h>
 #include <linux/platform_device.h>
+#include <linux/slab.h>
 
 /* PSIF register offsets */
 #define PSIF_CR                         0x00
@@ -137,7 +138,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);
@@ -352,6 +353,7 @@ static struct platform_driver psif_driver = {
         .remove         = __exit_p(psif_remove),
         .driver         = {
                 .name   = "atmel_psif",
+                .owner  = THIS_MODULE,
         },
         .suspend        = psif_suspend,
         .resume         = psif_resume,