Commit c9c041fc authored Dec 31, 2009 by Anisse Astier Committed by Len Brown Jan 01, 2010

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=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>

parent cd6e125c

drivers/platform/x86/hp-wmi.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -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)