Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8e4e2efd authored by Axel Lin's avatar Axel Lin Committed by Matthew Garrett
Browse files

fujitsu-laptop: remove unnecessary input_free_device calls 



input_free_device() should only be used if input_register_device() was not
called yet or if it failed.  This patch removes unnecessary
input_free_device calls.

Signed-off-by: default avatarAxel Lin <axel.lin@gmail.com>
Acked-by: default avatarJonathan Woithe <jwoithe@physics.adelaide.edu.au>
Acked-by: default avatarDmitry Torokhov <dtor@mail.ru>
Cc: Matthew Garrett <mjg@redhat.com>a
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarMatthew Garrett <mjg@redhat.com>
parent 24964639

drivers/platform/x86/fujitsu-laptop.c

+2 −4
Original line number Diff line number Diff line
@@ -725,6 +725,7 @@ static int acpi_fujitsu_add(struct acpi_device *device) 


err_unregister_input_dev:

	input_unregister_device(input);

	input = NULL;

err_free_input_dev:

	input_free_device(input);

err_stop:
@@ -738,8 +739,6 @@ static int acpi_fujitsu_remove(struct acpi_device *device, int type) 


	input_unregister_device(input);



	input_free_device(input);



	fujitsu->acpi_handle = NULL;



	return 0;
@@ -930,6 +929,7 @@ static int acpi_fujitsu_hotkey_add(struct acpi_device *device) 


err_unregister_input_dev:

	input_unregister_device(input);

	input = NULL;

err_free_input_dev:

	input_free_device(input);

err_free_fifo:
@@ -953,8 +953,6 @@ static int acpi_fujitsu_hotkey_remove(struct acpi_device *device, int type) 


	input_unregister_device(input);



	input_free_device(input);



	kfifo_free(&fujitsu_hotkey->fifo);



	fujitsu_hotkey->acpi_handle = NULL;