diff options
| author | Ben Dooks | 2005-07-03 18:44:40 +0200 |
|---|---|---|
| committer | Russell King | 2005-07-03 18:44:40 +0200 |
| commit | 75f631dc45c7327df26b82b9aea69376a306409c (patch) | |
| tree | 95535491bae8e4126cb743e4000e7c201d7392c2 /drivers/serial | |
| parent | [PATCH] ARM: Remove machine description macros (diff) | |
| download | kernel-qcow2-linux-75f631dc45c7327df26b82b9aea69376a306409c.tar.gz kernel-qcow2-linux-75f631dc45c7327df26b82b9aea69376a306409c.tar.xz kernel-qcow2-linux-75f631dc45c7327df26b82b9aea69376a306409c.zip | |
[PATCH] ARM: 2785/1: S3C24XX - serial calls request_irq() with IRQs disabled
Patch from Ben Dooks
The request_irq() function is called by s3c24xx uart driver with
the local IRQs disabled. The request_irq() function can allocate
memory via kmalloc(), and this may sleep causing a warning about
sleeping in an invalid context.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'drivers/serial')
| -rw-r--r-- | drivers/serial/s3c2410.c | 5 |
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; } |