Commit ad5a942f authored by Pranay Kr. Srivastava's avatar Pranay Kr. Srivastava Committed by Greg Kroah-Hartman
Browse files

remove unnecessary initial allocation of vc 



This patch removes the unnecessary allocation of
current foreground vc during initialization.

This initialization is already handled in the loop
that follows it for all available virtual consoles.

Signed-off-by: default avatarPranay Kr. Srivastava <pranjas@gmail.com>
Reviewed-by: default avatarSamuel Thibault <samuel.thibault@ens-lyon.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4e9cc9a0

drivers/staging/speakup/main.c

+0 −11
Original line number Diff line number Diff line
@@ -2329,7 +2329,6 @@ static int __init speakup_init(void) 
{

	int i;

	long err = 0;

	struct st_spk_t *first_console;

	struct vc_data *vc = vc_cons[fg_console].d;

	struct var_t *var;
@@ -2354,15 +2353,6 @@ static int __init speakup_init(void) 
	if (err)

		goto error_virtkeyboard;



	first_console = kzalloc(sizeof(*first_console), GFP_KERNEL);

	if (!first_console) {

		err = -ENOMEM;

		goto error_alloc;

	}



	speakup_console[vc->vc_num] = first_console;

	speakup_date(vc);



	for (i = 0; i < MAX_NR_CONSOLES; i++)

		if (vc_cons[i].d) {

			err = speakup_allocate(vc_cons[i].d);
@@ -2424,7 +2414,6 @@ static int __init speakup_init(void) 
	for (i = 0; i < MAX_NR_CONSOLES; i++)

		kfree(speakup_console[i]);



error_alloc:

	speakup_remove_virtual_keyboard();



error_virtkeyboard: