diff options
author | James <> | 2013-03-17 12:16:37 +0000 |
---|---|---|
committer | James <> | 2013-03-17 12:16:37 +0000 |
commit | 27b76ab0671089c47506615a796a261e993896a7 (patch) | |
tree | 61213d67e7fa87b20356b23798558e2c4212c42f /target/linux/omap24xx/patches-3.3/.svn/text-base/420-hci-h4p-interrupt-workaround.patch.svn-base | |
download | trunk-36060-master.tar.gz trunk-36060-master.tar.bz2 trunk-36060-master.zip |
Diffstat (limited to 'target/linux/omap24xx/patches-3.3/.svn/text-base/420-hci-h4p-interrupt-workaround.patch.svn-base')
-rw-r--r-- | target/linux/omap24xx/patches-3.3/.svn/text-base/420-hci-h4p-interrupt-workaround.patch.svn-base | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/target/linux/omap24xx/patches-3.3/.svn/text-base/420-hci-h4p-interrupt-workaround.patch.svn-base b/target/linux/omap24xx/patches-3.3/.svn/text-base/420-hci-h4p-interrupt-workaround.patch.svn-base new file mode 100644 index 0000000..0d2b4d2 --- /dev/null +++ b/target/linux/omap24xx/patches-3.3/.svn/text-base/420-hci-h4p-interrupt-workaround.patch.svn-base @@ -0,0 +1,36 @@ +--- a/arch/arm/mach-omap2/omap_hwmod_2xxx_3xxx_ipblock_data.c ++++ b/arch/arm/mach-omap2/omap_hwmod_2xxx_3xxx_ipblock_data.c +@@ -235,7 +235,7 @@ struct omap_hwmod_irq_info omap2_timer11 + }; + + struct omap_hwmod_irq_info omap2_uart1_mpu_irqs[] = { +- { .irq = INT_24XX_UART1_IRQ, }, ++ { .irq = 0, }, + { .irq = -1 } + }; + +--- a/drivers/tty/serial/omap-serial.c ++++ b/drivers/tty/serial/omap-serial.c +@@ -517,8 +517,10 @@ static int serial_omap_startup(struct ua + /* + * Allocate the IRQ + */ +- retval = request_irq(up->port.irq, serial_omap_irq, up->port.irqflags, +- up->name, up); ++ retval = 0; ++ if (up->port.irq) ++ retval = request_irq(up->port.irq, serial_omap_irq, ++ up->port.irqflags, up->name, up); + if (retval) + return retval; + +@@ -629,7 +631,8 @@ static void serial_omap_shutdown(struct + } + + pm_runtime_put(&up->pdev->dev); +- free_irq(up->port.irq, up); ++ if (up->port.irq) ++ free_irq(up->port.irq, up); + } + + static inline void |