path: root/arch/blackfin
diff options
authorMichael Hennerich <michael.hennerich@analog.com>2007-05-21 18:09:20 +0800
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-05-21 09:50:22 -0700
commit6e537e9329d133526a576b741f85b3d48edc4ac1 (patch)
tree2320a9073b8e057d9f69ce1ffa89eadc8e708f8d /arch/blackfin
parent8a0e6656030ffe9bcb81b725e956917bafc7522d (diff)
Blackfin arch: Fix bug using usb keyboard crashes kernel
Without conswitchp preset, we have the following situation: - During initcalls: con_init is called, and returns because of !display_desc. - At this point there is no memory allocated for vc_cons[].d A bit later vty_init calls kbd_init. - From now on events are passed to kbd_event which will then call kbd_keycode. - kbd_keycode will oops on a NULL pointer dereference on vc->vc_tty Signed-off-by: Michael Hennerich <michael.hennerich@analog.com> Cc: Pekka Enberg <penberg@cs.helsinki.fi> Signed-off-by: Bryan Wu <bryan.wu@analog.com> [ Added commit description based on email thread. - Linus ] Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/blackfin')
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/blackfin/kernel/setup.c b/arch/blackfin/kernel/setup.c
index 342bb8dd56a..c456ee5c1b4 100644
--- a/arch/blackfin/kernel/setup.c
+++ b/arch/blackfin/kernel/setup.c
@@ -33,7 +33,6 @@
#include <linux/seq_file.h>
#include <linux/cpu.h>
#include <linux/module.h>
-#include <linux/console.h>
#include <linux/tty.h>
#include <linux/ext2_fs.h>
@@ -175,6 +174,9 @@ void __init setup_arch(char **cmdline_p)
unsigned long mtd_phys = 0;
+ conswitchp = &dummy_con;
cclk = get_cclk();
sclk = get_sclk();