diff options
Diffstat (limited to 'drivers/input')
| -rw-r--r-- | drivers/input/mouse/pc110pad.c | 7 | ||||
| -rw-r--r-- | drivers/input/touchscreen/corgi_ts.c | 8 |
2 files changed, 9 insertions, 6 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 @@ #include <linux/init.h> #include <linux/interrupt.h> #include <linux/pci.h> +#include <linux/delay.h> #include <asm/io.h> #include <asm/irq.h> @@ -62,8 +63,10 @@ static irqreturn_t pc110pad_interrupt(int irq, void *ptr) int value = inb_p(pc110pad_io); int handshake = inb_p(pc110pad_io + 2); - outb_p(handshake | 1, pc110pad_io + 2); - outb_p(handshake & ~1, pc110pad_io + 2); + outb(handshake | 1, pc110pad_io + 2); + udelay(2); + outb(handshake & ~1, pc110pad_io + 2); + udelay(2); inb_p(0x64); pc110pad_data[pc110pad_count++] = value; diff --git a/drivers/input/touchscreen/corgi_ts.c b/drivers/input/touchscreen/corgi_ts.c index b1b2e07bf080..99d92f5c93d6 100644 --- a/drivers/input/touchscreen/corgi_ts.c +++ b/drivers/input/touchscreen/corgi_ts.c @@ -74,10 +74,10 @@ extern unsigned int get_clk_frequency_khz(int info); static unsigned long calc_waittime(struct corgi_ts *corgi_ts) { - unsigned long hsync_len = corgi_ts->machinfo->get_hsync_len(); + unsigned long hsync_invperiod = corgi_ts->machinfo->get_hsync_invperiod(); - if (hsync_len) - return get_clk_frequency_khz(0)*1000/hsync_len; + if (hsync_invperiod) + return get_clk_frequency_khz(0)*1000/hsync_invperiod; else return 0; } @@ -114,7 +114,7 @@ static int sync_receive_data_send_cmd(struct corgi_ts *corgi_ts, int doRecive, i if (timer2-timer1 > wait_time) { /* too slow - timeout, try again */ corgi_ts->machinfo->wait_hsync(); - /* get OSCR */ + /* get CCNT */ CCNT(timer1); /* Wait after HSync */ CCNT(timer2); |
