]> err.no Git - linux-2.6/commitdiff
[PATCH] ioc4_serial: irq flags fix
authorAndrew Morton <akpm@osdl.org>
Mon, 30 Oct 2006 06:46:33 +0000 (22:46 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Mon, 30 Oct 2006 20:08:40 +0000 (12:08 -0800)
Use the correct type for the CPU flags.

Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
drivers/serial/ioc4_serial.c

index ff4fa25f9fd12cdac405130e096c2200d9eb40fc..711bd151143913c0f48a836701f196dbc96eeb79 100644 (file)
@@ -921,7 +921,7 @@ static void handle_dma_error_intr(void *arg, uint32_t other_ir)
 {
        struct ioc4_port *port = (struct ioc4_port *)arg;
        struct hooks *hooks = port->ip_hooks;
-       unsigned int flags;
+       unsigned long flags;
 
        spin_lock_irqsave(&port->ip_lock, flags);
 
@@ -1834,7 +1834,7 @@ static void handle_intr(void *arg, uint32_t sio_ir)
        struct ioc4_port *port = (struct ioc4_port *)arg;
        struct hooks *hooks = port->ip_hooks;
        unsigned int rx_high_rd_aborted = 0;
-       unsigned int flags;
+       unsigned long flags;
        struct uart_port *the_port;
        int loop_counter;