aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input/mouse
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-01-30 07:31:24 -0500
committerIngo Molnar <mingo@elte.hu>2008-01-30 07:31:24 -0500
commit41e191e85a122ad822deb7525a015410012e6c70 (patch)
tree242e5b4a24ffcc7f6b3cb63b96c2a397113af1dd /drivers/input/mouse
parentded9aa0db815b4e1271001561e177755cb8b9468 (diff)
x86: replace outb_p() with udelay(2) in drivers/input/mouse/pc110pad.c
replace outb_p() with udelay(2). This is a real ISA device so it likely needs this particular delay. Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'drivers/input/mouse')
-rw-r--r--drivers/input/mouse/pc110pad.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/input/mouse/pc110pad.c b/drivers/input/mouse/pc110pad.c
index 8991ab0b4fe3..61cff8374e6c 100644
--- a/drivers/input/mouse/pc110pad.c
+++ b/drivers/input/mouse/pc110pad.c
@@ -39,6 +39,7 @@
39#include <linux/init.h> 39#include <linux/init.h>
40#include <linux/interrupt.h> 40#include <linux/interrupt.h>
41#include <linux/pci.h> 41#include <linux/pci.h>
42#include <linux/delay.h>
42 43
43#include <asm/io.h> 44#include <asm/io.h>
44#include <asm/irq.h> 45#include <asm/irq.h>
@@ -62,8 +63,10 @@ static irqreturn_t pc110pad_interrupt(int irq, void *ptr)
62 int value = inb_p(pc110pad_io); 63 int value = inb_p(pc110pad_io);
63 int handshake = inb_p(pc110pad_io + 2); 64 int handshake = inb_p(pc110pad_io + 2);
64 65
65 outb_p(handshake | 1, pc110pad_io + 2); 66 outb(handshake | 1, pc110pad_io + 2);
66 outb_p(handshake & ~1, pc110pad_io + 2); 67 udelay(2);
68 outb(handshake & ~1, pc110pad_io + 2);
69 udelay(2);
67 inb_p(0x64); 70 inb_p(0x64);
68 71
69 pc110pad_data[pc110pad_count++] = value; 72 pc110pad_data[pc110pad_count++] = value;