diff options
| author | John Crispin <john@openwrt.org> | 2010-03-18 13:55:14 +0000 |
|---|---|---|
| committer | John Crispin <john@openwrt.org> | 2010-03-18 13:55:14 +0000 |
| commit | aeadc74d0e9c4e2a7495407822e873c157f491cb (patch) | |
| tree | 6f5cca074c855627d9e0ffe81c398d90ba00746b /target/linux/ifxmips | |
| parent | 950dc23320605981d9275b5ffa760b82ffaad344 (diff) | |
| download | upstream-aeadc74d0e9c4e2a7495407822e873c157f491cb.tar.gz upstream-aeadc74d0e9c4e2a7495407822e873c157f491cb.tar.bz2 upstream-aeadc74d0e9c4e2a7495407822e873c157f491cb.zip | |
Bugfix: do not call request_irq() with interrupts disabled, signed off by Ithamar R. Adema
SVN-Revision: 20273
Diffstat (limited to 'target/linux/ifxmips')
| -rw-r--r-- | target/linux/ifxmips/patches-2.6.30/120-serial.patch | 24 |
1 files changed, 9 insertions, 15 deletions
diff --git a/target/linux/ifxmips/patches-2.6.30/120-serial.patch b/target/linux/ifxmips/patches-2.6.30/120-serial.patch index 8aa9dbbe45..1169378e42 100644 --- a/target/linux/ifxmips/patches-2.6.30/120-serial.patch +++ b/target/linux/ifxmips/patches-2.6.30/120-serial.patch @@ -1,7 +1,7 @@ -Index: linux-2.6.30.8/drivers/serial/Kconfig +Index: linux-2.6.30.10/drivers/serial/Kconfig =================================================================== ---- linux-2.6.30.8.orig/drivers/serial/Kconfig 2009-09-24 17:28:02.000000000 +0200 -+++ linux-2.6.30.8/drivers/serial/Kconfig 2009-10-19 21:31:32.000000000 +0200 +--- linux-2.6.30.10.orig/drivers/serial/Kconfig 2009-12-04 07:00:07.000000000 +0100 ++++ linux-2.6.30.10/drivers/serial/Kconfig 2010-03-18 12:24:20.000000000 +0100 @@ -1365,6 +1365,14 @@ help Support for Console on the NWP serial ports. @@ -17,20 +17,20 @@ Index: linux-2.6.30.8/drivers/serial/Kconfig config SERIAL_QE tristate "Freescale QUICC Engine serial port support" depends on QUICC_ENGINE -Index: linux-2.6.30.8/drivers/serial/Makefile +Index: linux-2.6.30.10/drivers/serial/Makefile =================================================================== ---- linux-2.6.30.8.orig/drivers/serial/Makefile 2009-09-24 17:28:02.000000000 +0200 -+++ linux-2.6.30.8/drivers/serial/Makefile 2009-10-19 21:31:32.000000000 +0200 +--- linux-2.6.30.10.orig/drivers/serial/Makefile 2009-12-04 07:00:07.000000000 +0100 ++++ linux-2.6.30.10/drivers/serial/Makefile 2010-03-18 12:24:20.000000000 +0100 @@ -77,3 +77,4 @@ obj-$(CONFIG_SERIAL_KS8695) += serial_ks8695.o obj-$(CONFIG_KGDB_SERIAL_CONSOLE) += kgdboc.o obj-$(CONFIG_SERIAL_QE) += ucc_uart.o +obj-$(CONFIG_SERIAL_IFXMIPS) += ifxmips_asc.o -Index: linux-2.6.30.8/drivers/serial/ifxmips_asc.c +Index: linux-2.6.30.10/drivers/serial/ifxmips_asc.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.30.8/drivers/serial/ifxmips_asc.c 2009-10-19 21:41:27.000000000 +0200 -@@ -0,0 +1,561 @@ ++++ linux-2.6.30.10/drivers/serial/ifxmips_asc.c 2010-03-18 14:04:58.000000000 +0100 +@@ -0,0 +1,555 @@ +/* + * Based on drivers/char/serial.c, by Linus Torvalds, Theodore Ts'o. + * @@ -258,7 +258,6 @@ Index: linux-2.6.30.8/drivers/serial/ifxmips_asc.c + +static int ifxmipsasc_startup(struct uart_port *port) +{ -+ unsigned long flags; + int retval; + + port->uartclk = ifxmips_get_fpi_hz(); @@ -271,8 +270,6 @@ Index: linux-2.6.30.8/drivers/serial/ifxmips_asc.c + wmb(); + ifxmips_w32(ifxmips_r32(port->membase + IFXMIPS_ASC_CON) | ASCCON_M_8ASYNC | ASCCON_FEN | ASCCON_TOEN | ASCCON_ROEN, port->membase + IFXMIPS_ASC_CON); + -+ local_irq_save(flags); -+ + retval = request_irq(port->irq, ifxmipsasc_tx_int, IRQF_DISABLED, "asc_tx", port); + if (retval) { + printk(KERN_ERR "failed to request ifxmipsasc_tx_int\n"); @@ -292,15 +289,12 @@ Index: linux-2.6.30.8/drivers/serial/ifxmips_asc.c + } + + ifxmips_w32(ASC_IRNREN_RX_BUF | ASC_IRNREN_TX_BUF | ASC_IRNREN_ERR | ASC_IRNREN_TX, port->membase + IFXMIPS_ASC_IRNREN); -+ -+ local_irq_restore(flags); + return 0; + +err2: + free_irq(port->irq + 2, port); +err1: + free_irq(port->irq, port); -+ local_irq_restore(flags); + return retval; +} + |