1
0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-12-01 01:16:15 +02:00
openwrt-xburst/target/linux/omap24xx/patches-3.1/830-omap2-serial-fixes.patch
jogo 85ec5ce98d linux: update 3.1 to 3.1.1
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@29007 3c298f89-4303-0410-b956-a3cf2f4a3e73
2011-11-13 10:48:05 +00:00

24 lines
553 B
Diff

--- a/arch/arm/mach-omap2/serial.c
+++ b/arch/arm/mach-omap2/serial.c
@@ -660,6 +660,8 @@ static void serial_out_override(struct u
}
#endif
+static struct omap_uart_state statebuf[4];
+
static int __init omap_serial_early_init(void)
{
int i = 0;
@@ -675,9 +677,9 @@ static int __init omap_serial_early_init
if (!oh)
break;
- uart = kzalloc(sizeof(struct omap_uart_state), GFP_KERNEL);
- if (WARN_ON(!uart))
+ if (WARN_ON(i >= ARRAY_SIZE(statebuf)))
return -ENODEV;
+ uart = &statebuf[i];
uart->oh = oh;
uart->num = i++;