Browse Source

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>
Anisse Astier 15 years ago
parent
commit
c9c041fcb1
1 changed files with 0 additions and 2 deletions
  1. 0 2
      drivers/platform/x86/hp-wmi.c

+ 0 - 2
drivers/platform/x86/hp-wmi.c

@@ -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)