tree 6492925790949f9a23ded26089956207a5f03423
parent cd6e125c58ae1561bedb6ea6f70b00d6c2599d62
author Anisse Astier <anisse@astier.eu> 1262274093 +0100
committer Len Brown <len.brown@intel.com> 1262372665 -0500

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>