Skip to content

Commit

Permalink
fujitsu-laptop: remove unnecessary input_free_device calls
Browse files Browse the repository at this point in the history
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: Axel Lin <axel.lin@gmail.com>
Acked-by: Jonathan Woithe <jwoithe@physics.adelaide.edu.au>
Acked-by: Dmitry Torokhov <dtor@mail.ru>
Cc: Matthew Garrett <mjg@redhat.com>a
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Matthew Garrett <mjg@redhat.com>
  • Loading branch information
Axel Lin authored and Matthew Garrett committed Aug 3, 2010
1 parent 2496463 commit 8e4e2ef
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions drivers/platform/x86/fujitsu-laptop.c
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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;
Expand Down Expand Up @@ -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:
Expand All @@ -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;
Expand Down

0 comments on commit 8e4e2ef

Please sign in to comment.