diff --git a/[refs] b/[refs] index f0a2cc9cd9ed..d0ec6ad1ce46 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5f6d9c072df162a8601a09e6c63fd0e4f5aecd06 +refs/heads/master: 64e4da57964c03da9a03087a398cade81b7bb496 diff --git a/trunk/drivers/char/hvc_console.c b/trunk/drivers/char/hvc_console.c index fd7532504252..de849f571ea2 100644 --- a/trunk/drivers/char/hvc_console.c +++ b/trunk/drivers/char/hvc_console.c @@ -144,8 +144,8 @@ struct hvc_struct *hvc_get_by_index(int index) * console interfaces but can still be used as a tty device. This has to be * static because kmalloc will not work during early console init. */ -static uint32_t vtermnos[MAX_NR_HVC_CONSOLES]; - +static uint32_t vtermnos[MAX_NR_HVC_CONSOLES] = + {[0 ... MAX_NR_HVC_CONSOLES - 1] = -1}; /* * Console APIs, NOT TTY. These APIs are available immediately when @@ -213,10 +213,6 @@ struct console hvc_con_driver = { /* Early console initialization. Preceeds driver initialization. */ static int __init hvc_console_init(void) { - int i; - - for (i=0; i