summaryrefslogtreecommitdiffstats
path: root/drivers/serial
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-07-03 14:39:33 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2005-07-03 14:39:33 -0700
commit19f7241a3b087bbf4dd107c979608fdb56c83a09 (patch)
treede5a3cb87a4731d8b8c075c6de4800fe52f5bc70 /drivers/serial
parent08ab8c20316d6189a16b8101544a3e32b4c75e49 (diff)
parent0d670b413f042eccdffc45bafb9840244752707f (diff)
downloadlinux-19f7241a3b087bbf4dd107c979608fdb56c83a09.tar.gz
linux-19f7241a3b087bbf4dd107c979608fdb56c83a09.tar.bz2
linux-19f7241a3b087bbf4dd107c979608fdb56c83a09.zip
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'drivers/serial')
-rw-r--r--drivers/serial/s3c2410.c5
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;
}