diff options
author | Maxim Mikityanskiy <maxtram95@gmail.com> | 2012-12-15 19:31:31 +0200 |
---|---|---|
committer | Ben Hutchings <ben@decadent.org.uk> | 2013-04-25 20:25:46 +0100 |
commit | b2fd07f1a7d242f1f53711546cbd5f8fecba8891 (patch) | |
tree | b2c6cb22ea9e058e6d8ee33889ecee79f7d716fa | |
parent | 85bea48d42a7dd55e08aa1423429767a8a395bbf (diff) | |
download | linux-stable-b2fd07f1a7d242f1f53711546cbd5f8fecba8891.tar.gz linux-stable-b2fd07f1a7d242f1f53711546cbd5f8fecba8891.tar.bz2 linux-stable-b2fd07f1a7d242f1f53711546cbd5f8fecba8891.zip |
msi-wmi: Fix memory leak
commit 51c94491c82c3d9029f6e87a1a153db321d88e35 upstream.
Fix memory leak - don't forget to kfree ACPI object when returning from
msi_wmi_notify() after suppressing key event.
Signed-off-by: Maxim Mikityanskiy <maxtram95@gmail.com>
Acked-by: Anisse Astier <anisse@astier.eu>
Signed-off-by: Lee, Chun-Yi <jlee@suse.com>
Signed-off-by: Matthew Garrett <matthew.garrett@nebula.com>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
-rw-r--r-- | drivers/platform/x86/msi-wmi.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/platform/x86/msi-wmi.c b/drivers/platform/x86/msi-wmi.c index 2264331bd48e..b96766b61ea3 100644 --- a/drivers/platform/x86/msi-wmi.c +++ b/drivers/platform/x86/msi-wmi.c @@ -176,7 +176,7 @@ static void msi_wmi_notify(u32 value, void *context) pr_debug("Suppressed key event 0x%X - " "Last press was %lld us ago\n", key->code, ktime_to_us(diff)); - return; + goto msi_wmi_notify_exit; } last_pressed[key->code - SCANCODE_BASE] = cur; @@ -195,6 +195,8 @@ static void msi_wmi_notify(u32 value, void *context) pr_info("Unknown key pressed - %x\n", eventcode); } else pr_info("Unknown event received\n"); + +msi_wmi_notify_exit: kfree(response.pointer); } |