summaryrefslogtreecommitdiffstats
path: root/target/linux/omap24xx/patches-3.1/830-omap2-serial-fixes.patch
diff options
context:
space:
mode:
authormb <mb@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-10-29 19:02:50 +0000
committermb <mb@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-10-29 19:02:50 +0000
commitd63172b5b35ede6076a551def2819569ebc2d5cc (patch)
treea8a9656048176fd8ca1331bc5221a0ccc1168089 /target/linux/omap24xx/patches-3.1/830-omap2-serial-fixes.patch
parent41db87f4cccd2639e57db2888cc442f65e38eddb (diff)
omap24xx: Add 3.1 patchset.
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@28672 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/omap24xx/patches-3.1/830-omap2-serial-fixes.patch')
-rw-r--r--target/linux/omap24xx/patches-3.1/830-omap2-serial-fixes.patch25
1 files changed, 25 insertions, 0 deletions
diff --git a/target/linux/omap24xx/patches-3.1/830-omap2-serial-fixes.patch b/target/linux/omap24xx/patches-3.1/830-omap2-serial-fixes.patch
new file mode 100644
index 000000000..b423114c9
--- /dev/null
+++ b/target/linux/omap24xx/patches-3.1/830-omap2-serial-fixes.patch
@@ -0,0 +1,25 @@
+Index: linux-3.1-rc4/arch/arm/mach-omap2/serial.c
+===================================================================
+--- linux-3.1-rc4.orig/arch/arm/mach-omap2/serial.c 2011-10-27 16:38:20.000000000 +0200
++++ linux-3.1-rc4/arch/arm/mach-omap2/serial.c 2011-10-27 16:53:53.831807619 +0200
+@@ -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++;