redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

platform-drivers-x86: ideapad-laptop: add missing ideapad_input_exit in ideapad_acpi_add error path

Browse source 
In the case of ideapad_backlight_init() failure,
we need to free the resources allocated by ideapad_input_init().

Aslo drop __devexit annotation for ideapad_input_exit() because
we also call it in ideapad_acpi_add() error path.

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Matthew Garrett <mjg@redhat.com>
This commit is contained in:
Axel Lin 2011-07-27 15:27:34 +08:00 committed by Matthew Garrett
parent 70fda70a72
commit 7451a55af0
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
drivers/platform/x86/ideapad-laptop.c
View file

@ -406,7 +406,7 @@ err_free_dev:
return error; return error;
} }
static void __devexit ideapad_input_exit(struct ideapad_private *priv) static void ideapad_input_exit(struct ideapad_private *priv)
{ {
sparse_keymap_free(priv->inputdev); sparse_keymap_free(priv->inputdev);
input_unregister_device(priv->inputdev); input_unregister_device(priv->inputdev);
@ -563,6 +563,7 @@ static int __devinit ideapad_acpi_add(struct acpi_device *adevice)
backlight_failed: backlight_failed:
for (i = 0; i < IDEAPAD_RFKILL_DEV_NUM; i++) for (i = 0; i < IDEAPAD_RFKILL_DEV_NUM; i++)
ideapad_unregister_rfkill(adevice, i); ideapad_unregister_rfkill(adevice, i);
ideapad_input_exit(priv);
input_failed: input_failed:
ideapad_platform_exit(priv); ideapad_platform_exit(priv);
platform_failed: platform_failed: