From: Andrew Morton Cc: Greg KH Signed-off-by: Andrew Morton --- drivers/char/nozomi.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff -puN drivers/char/nozomi.c~nozomi-irq-flags-fixes drivers/char/nozomi.c --- a/drivers/char/nozomi.c~nozomi-irq-flags-fixes +++ a/drivers/char/nozomi.c @@ -1447,7 +1447,7 @@ static void tty_flip_queue_function(void { dc_t *dc = (dc_t *) tmp_dc; int i; - u32 flags; + unsigned long flags; /* Enable interrupt for that port */ for (i = 0; i < MAX_PORT; i++) { @@ -1623,8 +1623,7 @@ static int __devinit nozomi_card_init(st static void tty_do_close(dc_t * dc, struct port *port) { - - u32 flags; + unsigned long flags; if (down_interruptible(&port->tty_sem)) { return; @@ -1752,7 +1751,7 @@ static int ntty_open(struct tty_struct * s32 index = get_index(tty); struct port *port = get_port_by_tty(tty); dc_t *dc = get_dc_by_tty(tty); - u32 flags; + unsigned long flags; if (down_interruptible(&port->tty_sem)) { return -ERESTARTSYS; @@ -1795,7 +1794,7 @@ static int ntty_write(struct tty_struct int rval = -EINVAL; dc_t *dc = get_dc_by_tty(tty); struct port *port = (struct port *)tty->driver_data; - u32 flags; + unsigned long flags; /* D1( "WRITEx: %d, index = %d", count, index); */ @@ -2056,7 +2055,7 @@ static int ntty_ioctl(struct tty_struct { struct port *port = tty->driver_data; dc_t *dc = get_dc_by_tty(tty); - u32 flags; + unsigned long flags; int mask; int rval = -ENOIOCTLCMD; @@ -2129,7 +2128,7 @@ static void ntty_unthrottle(struct tty_s { struct port *port = (struct port *)tty->driver_data; dc_t *dc = get_dc_by_tty(tty); - u32 flags; + unsigned long flags; D1("UNTHROTTLE"); spin_lock_irqsave(&dc->spin_mutex, flags); @@ -2145,7 +2144,7 @@ static void ntty_throttle(struct tty_str { struct port *port = (struct port *)tty->driver_data; dc_t *dc = get_dc_by_tty(tty); - u32 flags; + unsigned long flags; D1("THROTTLE"); spin_lock_irqsave(&dc->spin_mutex, flags); _