summaryrefslogtreecommitdiffstats
path: root/target/linux/omap24xx/patches-2.6.38/830-omap2-serial-fixes.patch
blob: e503b0e595bf7fa6165757dcaf3ef858b6c447e2 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
Index: linux-2.6.38-rc7/arch/arm/mach-omap2/serial.c
===================================================================
--- linux-2.6.38-rc7.orig/arch/arm/mach-omap2/serial.c	2011-03-07 17:24:16.786259530 +0100
+++ linux-2.6.38-rc7/arch/arm/mach-omap2/serial.c	2011-03-07 17:24:18.951998600 +0100
@@ -660,6 +660,8 @@ static void serial_out_override(struct u
 }
 #endif
 
+static struct omap_uart_state statebuf[4];
+
 void __init omap_serial_early_init(void)
 {
 	int i = 0;
@@ -675,9 +677,9 @@ void __init omap_serial_early_init(void)
 		if (!oh)
 			break;
 
-		uart = kzalloc(sizeof(struct omap_uart_state), GFP_KERNEL);
-		if (WARN_ON(!uart))
+		if (WARN_ON(i >= ARRAY_SIZE(statebuf)))
 			return;
+		uart = &statebuf[i];
 
 		uart->oh = oh;
 		uart->num = i++;