[PATCH 4/4] (drop after 3.0) ideapad: add missing ideapad_input_exit in ideapad_acpi_add error path
Ike Panhc
ike.pan at canonical.com
Thu Aug 11 09:28:46 UTC 2011
From: Axel Lin <axel.lin at gmail.com>
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 at gmail.com>
Signed-off-by: Matthew Garrett <mjg at redhat.com>
(cherry picked from mainline commit 7451a55af08d40fd6b28802f4e26a13264114430)
Signed-off-by: Ike Panhc <ike.pan at canonical.com>
---
drivers/platform/x86/ideapad-laptop.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/drivers/platform/x86/ideapad-laptop.c b/drivers/platform/x86/ideapad-laptop.c
index 8811c68..0c59541 100644
--- a/drivers/platform/x86/ideapad-laptop.c
+++ b/drivers/platform/x86/ideapad-laptop.c
@@ -406,7 +406,7 @@ err_free_dev:
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);
input_unregister_device(priv->inputdev);
@@ -563,6 +563,7 @@ static int __devinit ideapad_acpi_add(struct acpi_device *adevice)
backlight_failed:
for (i = 0; i < IDEAPAD_RFKILL_DEV_NUM; i++)
ideapad_unregister_rfkill(adevice, i);
+ ideapad_input_exit(priv);
input_failed:
ideapad_platform_exit(priv);
platform_failed:
--
1.7.5.4
More information about the kernel-team
mailing list