Prev: e1000e: receives no packets after resume (2.6.35-rc3-00262-g984bc96)
Next: [PATCH 0/2] use q->prep_rq_fn for flush requests instead of q->prepare_flush_fn()
From: Axel Lin on 2 Jul 2010 03:30
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(a)gmail.com>
---
drivers/platform/x86/fujitsu-laptop.c | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/platform/x86/fujitsu-laptop.c b/drivers/platform/x86/fujitsu-laptop.c
index e325aeb..4346d26 100644
--- a/drivers/platform/x86/fujitsu-laptop.c
+++ b/drivers/platform/x86/fujitsu-laptop.c
@@ -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;
--
1.5.4.3



--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
 | 
Pages: 1
Prev: e1000e: receives no packets after resume (2.6.35-rc3-00262-g984bc96)
Next: [PATCH 0/2] use q->prep_rq_fn for flush requests instead of q->prepare_flush_fn()