diff options
| author | Anisse Astier <anisse@astier.eu> | 2009-12-31 18:41:33 +0300 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2010-01-01 22:04:25 +0300 |
| commit | c9c041fcb1a4d69ed4791f00b57554eeb341d148 (patch) | |
| tree | 6492925790949f9a23ded26089956207a5f03423 /drivers/platform/x86 | |
| parent | cd6e125c58ae1561bedb6ea6f70b00d6c2599d62 (diff) | |
| download | linux-c9c041fcb1a4d69ed4791f00b57554eeb341d148.tar.xz | |
hp-wmi: remove double free caused by merge conflict
Commit 3e9b988e4edf065d39c1343937f717319b1c1065
"wmi: Free the allocated acpi objects through wmi_get_event_data"
had the same purpose as commit
44ef00e6482e755f36629773abc2aee83a6f53e3
"hp-wmi: Fix two memleaks"
This should solve this regression:
http://bugzilla.kernel.org/show_bug.cgi?id=14890
Signed-off-by: Anisse Astier <anisse@astier.eu>
Reported-by: Sedat Dilek <sedat.dilek@googlemail.com>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/platform/x86')
| -rw-r--r-- | drivers/platform/x86/hp-wmi.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/platform/x86/hp-wmi.c b/drivers/platform/x86/hp-wmi.c index 5b648f0c6075..ad4c414dbfbc 100644 --- a/drivers/platform/x86/hp-wmi.c +++ b/drivers/platform/x86/hp-wmi.c @@ -393,8 +393,6 @@ static void hp_wmi_notify(u32 value, void *context) } else printk(KERN_INFO "HP WMI: Unknown key pressed - %x\n", eventcode); - - kfree(obj); } static int __init hp_wmi_input_setup(void) |