From e03bdac474aaacb126e5762c8ce36234ce4b7b15 Mon Sep 17 00:00:00 2001 From: Axel Lin Date: Wed, 30 Jun 2010 17:25:46 +0800 Subject: [PATCH] --- yaml --- r: 202457 b: refs/heads/master c: 32ab72e7ca7aed399b81a3ffec26d7353bd33581 h: refs/heads/master i: 202455: a167fcc14edaa58659a5d7022c55d173a3deef2d v: v3 --- [refs] | 2 +- trunk/drivers/platform/x86/dell-wmi.c | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 31ce5ee28a54..b27ef0aed278 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d53bf0f32410c8c738935aa3d9740d66d39ba967 +refs/heads/master: 32ab72e7ca7aed399b81a3ffec26d7353bd33581 diff --git a/trunk/drivers/platform/x86/dell-wmi.c b/trunk/drivers/platform/x86/dell-wmi.c index 12a8e6fa1d56..08fb70f6d9bf 100644 --- a/trunk/drivers/platform/x86/dell-wmi.c +++ b/trunk/drivers/platform/x86/dell-wmi.c @@ -339,13 +339,18 @@ static int __init dell_wmi_init(void) acpi_video = acpi_video_backlight_support(); err = dell_wmi_input_setup(); - if (err) + if (err) { + if (dell_new_hk_type) + kfree(dell_wmi_keymap); return err; + } status = wmi_install_notify_handler(DELL_EVENT_GUID, dell_wmi_notify, NULL); if (ACPI_FAILURE(status)) { input_unregister_device(dell_wmi_input_dev); + if (dell_new_hk_type) + kfree(dell_wmi_keymap); printk(KERN_ERR "dell-wmi: Unable to register notify handler - %d\n", status); @@ -359,6 +364,8 @@ static void __exit dell_wmi_exit(void) { wmi_remove_notify_handler(DELL_EVENT_GUID); input_unregister_device(dell_wmi_input_dev); + if (dell_new_hk_type) + kfree(dell_wmi_keymap); } module_init(dell_wmi_init);