Merge master.kernel.org:/home/rmk/linux-2.6-arm

1 files changed, 0 insertions, 5 deletions

diff --git a/drivers/serial/s3c2410.c b/drivers/serial/s3c2410.c
index 5c4678478b1d..7365d4b50b95 100644
--- a/drivers/serial/s3c2410.c
+++ b/drivers/serial/s3c2410.c
@@ -522,14 +522,11 @@ static void s3c24xx_serial_shutdown(struct uart_port *port)
 static int s3c24xx_serial_startup(struct uart_port *port)
 {
         struct s3c24xx_uart_port *ourport = to_ourport(port);
-        unsigned long flags;
         int ret;
 
         dbg("s3c24xx_serial_startup: port=%p (%08lx,%p)\n",
             port->mapbase, port->membase);
 
-        local_irq_save(flags);
-
         rx_enabled(port) = 1;
 
         ret = request_irq(RX_IRQ(port),
@@ -563,12 +560,10 @@ static int s3c24xx_serial_startup(struct uart_port *port)
         /* the port reset code should have done the correct
          * register setup for the port controls */
 
-        local_irq_restore(flags);
         return ret;
 
  err:
         s3c24xx_serial_shutdown(port);
-        local_irq_restore(flags);
         return ret;
 }