Staging: speakup: Don't try to access an unallocated struct.
In speakup_init, we have the following: if (quiet_boot) spk_shut_up |= 0x01; And in spk_types.h: This patch moves the statement in speakup_init so that speakup_console[vc->vc_num] is guaranteed to be allocated when it executes. Signed-off-by: Christopher Brannon <chris@the-brannons.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Родитель
ebadb73043
Коммит
4afaee1561
|
@ -2268,8 +2268,6 @@ static int __init speakup_init(void)
|
|||
set_mask_bits(0, i, 2);
|
||||
|
||||
set_key_info(key_defaults, key_buf);
|
||||
if (quiet_boot)
|
||||
spk_shut_up |= 0x01;
|
||||
|
||||
/* From here on out, initializations can fail. */
|
||||
err = speakup_add_virtual_keyboard();
|
||||
|
@ -2292,6 +2290,9 @@ static int __init speakup_init(void)
|
|||
goto error_kobjects;
|
||||
}
|
||||
|
||||
if (quiet_boot)
|
||||
spk_shut_up |= 0x01;
|
||||
|
||||
err = speakup_kobj_init();
|
||||
if (err)
|
||||
goto error_kobjects;
|
||||
|
|
Загрузка…
Ссылка в новой задаче