From 8034ffb624b3d4713d9018141a5df5b606af5f87 Mon Sep 17 00:00:00 2001 From: Axel Lin Date: Wed, 27 Jul 2011 15:27:34 +0800 Subject: [PATCH] --- yaml --- r: 262622 b: refs/heads/master c: 7451a55af08d40fd6b28802f4e26a13264114430 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/platform/x86/ideapad-laptop.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index d6c4cb70ff3e..58396e948694 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 70fda70a724c737b0df4195763f9124d181fe64d +refs/heads/master: 7451a55af08d40fd6b28802f4e26a13264114430 diff --git a/trunk/drivers/platform/x86/ideapad-laptop.c b/trunk/drivers/platform/x86/ideapad-laptop.c index 8811c68f809d..0c595410e788 100644 --- a/trunk/drivers/platform/x86/ideapad-laptop.c +++ b/trunk/drivers/platform/x86/ideapad-laptop.c @@ -406,7 +406,7 @@ static int __devinit ideapad_input_init(struct ideapad_private *priv) 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: