diff options
author | Maxim Mikityanskiy <maxtram95@gmail.com> | 2012-12-15 12:31:31 -0500 |
---|---|---|
committer | Matthew Garrett <matthew.garrett@nebula.com> | 2013-02-24 17:49:54 -0500 |
commit | 51c94491c82c3d9029f6e87a1a153db321d88e35 (patch) | |
tree | 664be7db24943489d125577c5d82e23a7d2192a8 /drivers/platform/x86 | |
parent | 03696e51d75a3f23feb6b63dc6f3976a64c40b12 (diff) |
msi-wmi: Fix memory leak
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>
Diffstat (limited to 'drivers/platform/x86')
-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) | |||
176 | pr_debug("Suppressed key event 0x%X - " | 176 | pr_debug("Suppressed key event 0x%X - " |
177 | "Last press was %lld us ago\n", | 177 | "Last press was %lld us ago\n", |
178 | key->code, ktime_to_us(diff)); | 178 | key->code, ktime_to_us(diff)); |
179 | return; | 179 | goto msi_wmi_notify_exit; |
180 | } | 180 | } |
181 | last_pressed[key->code - SCANCODE_BASE] = cur; | 181 | last_pressed[key->code - SCANCODE_BASE] = cur; |
182 | 182 | ||
@@ -195,6 +195,8 @@ static void msi_wmi_notify(u32 value, void *context) | |||
195 | pr_info("Unknown key pressed - %x\n", eventcode); | 195 | pr_info("Unknown key pressed - %x\n", eventcode); |
196 | } else | 196 | } else |
197 | pr_info("Unknown event received\n"); | 197 | pr_info("Unknown event received\n"); |
198 | |||
199 | msi_wmi_notify_exit: | ||
198 | kfree(response.pointer); | 200 | kfree(response.pointer); |
199 | } | 201 | } |
200 | 202 | ||