hi Dmitry, 2010/7/2 Dmitry Torokhov <dmitry.torokhov@xxxxxxxxx>: > Hi Axel, > > On Fri, Jul 02, 2010 at 09:42:57AM +0800, Axel Lin wrote: >> 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@xxxxxxxxx> >> --- >> drivers/platform/x86/fujitsu-laptop.c | 21 ++++++++------------- >> 1 files changed, 8 insertions(+), 13 deletions(-) >> >> diff --git a/drivers/platform/x86/fujitsu-laptop.c b/drivers/platform/x86/fujitsu-laptop.c >> index e325aeb..dab1a0e 100644 >> --- a/drivers/platform/x86/fujitsu-laptop.c >> +++ b/drivers/platform/x86/fujitsu-laptop.c >> @@ -686,8 +686,10 @@ static int acpi_fujitsu_add(struct acpi_device *device) >> set_bit(KEY_UNKNOWN, input->keybit); >> >> error = input_register_device(input); >> - if (error) >> - goto err_free_input_dev; >> + if (error) { >> + input_free_device(input); >> + goto err_stop; >> + } > > Instead of using mixed in-line and goto style cleanup I prefer doig the > following: > > err_unregister_input_dev: > input_unregister_device(input); > input = NULL; <-- !!! > err_free_input_dev: > input_free_device(input); > > input_free_device() happily accepts NULL pointers. Thanks for the review. I will send a revised patch. Regards, Axel > > Otherwise the patch looks good. > > Thanks. > > -- > Dmitry > -- To unsubscribe from this list: send the line "unsubscribe platform-driver-x86" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html