Re: [PATCH] toshiba_acpi: FULL TOS1900 device support

From: Azael Avalos
Date: Fri Dec 10 2010 - 19:06:18 EST


Hi,

On Fri, Dec 10, 2010 at 2:35 PM, Dmitry Torokhov
<dmitry.torokhov@xxxxxxxxx> wrote:
> Hi Azael,
>
> On Fri, Dec 10, 2010 at 02:13:18PM -0700, Azael Avalos wrote:
>> Â Â Â error = input_register_device(toshiba_acpi.hotkey_dev);
>> Â Â Â if (error) {
>> Â Â Â Â Â Â Â printk(MY_INFO "Unable to register input device\n");
>> - Â Â Â Â Â Â goto err_remove_notify;
>> + Â Â Â Â Â Â Âgoto err_free_keymap;
>
> Extra space in indentation.
>
>> Â Â Â }
>>
>> Â Â Â return 0;
>>
>> - err_remove_notify:
>> - Â Â acpi_remove_notify_handler(toshiba_acpi.handle,
>> - Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â ÂACPI_DEVICE_NOTIFY, toshiba_acpi_notify);
>> - err_free_keymap:
>> - Â Â sparse_keymap_free(toshiba_acpi.hotkey_dev);
>> - err_free_dev:
>> +err_free_keymap:
>> + Â Â if (toshiba_acpi.hci_type == 2)
>> + Â Â Â Â Â Â i8042_remove_filter(toshiba_i8042_filter);
>> +err_free_dev:
>> Â Â Â input_free_device(toshiba_acpi.hotkey_dev);
>> Â Â Â toshiba_acpi.hotkey_dev = NULL;
>> Â Â Â return error;
>
> I do not actually see you calling sparse_keymap_free() in the error path
> anymore.

Oops, my bad, re-added now, so here it is regenerated: