Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-23 20:51:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

hp-wmi: remove double free caused by merge conflict

Browse Source 
Commit 3e9b988e4e
"wmi: Free the allocated acpi objects through wmi_get_event_data"
had the same purpose as commit
44ef00e648
"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>
This commit is contained in:
Anisse Astier 2009-12-31 16:41:33 +01:00 committed by Len Brown
parent cd6e125c58
commit c9c041fcb1
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/platform/x86/hp-wmi.c
View File

@ -393,8 +393,6 @@ static void hp_wmi_notify(u32 value, void *context)
} else } else
printk(KERN_INFO "HP WMI: Unknown key pressed - %x\n", printk(KERN_INFO "HP WMI: Unknown key pressed - %x\n",
eventcode); eventcode);
kfree(obj);
} }
static int __init hp_wmi_input_setup(void) static int __init hp_wmi_input_setup(void)