Commit c9c041fc authored by Anisse Astier's avatar Anisse Astier Committed by Len Brown

hp-wmi: remove double free caused by merge conflict

Commit 3e9b988e
"wmi: Free the allocated acpi objects through wmi_get_event_data"
had the same purpose as commit
44ef00e6
"hp-wmi: Fix two memleaks"

This should solve this regression:

http://bugzilla.kernel.org/show_bug.cgi?id=14890Signed-off-by: default avatarAnisse Astier <anisse@astier.eu>
Reported-by: default avatarSedat Dilek <sedat.dilek@googlemail.com>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent cd6e125c
......@@ -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)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment