Skip to content

Commit

Permalink
hp-wmi: remove double free caused by merge conflict
Browse files Browse the repository at this point in the history
Commit 3e9b988
"wmi: Free the allocated acpi objects through wmi_get_event_data"
had the same purpose as commit
44ef00e
"hp-wmi: Fix two memleaks"

This should solve this regression:

http://bugzilla.kernel.org/show_bug.cgi?id=14890

Signed-off-by: Anisse Astier <[email protected]>
Reported-by: Sedat Dilek <[email protected]>
Signed-off-by: Len Brown <[email protected]>
  • Loading branch information
anisse authored and lenb committed Jan 1, 2010
1 parent cd6e125 commit c9c041f
Showing 1 changed file with 0 additions and 2 deletions.
2 changes: 0 additions & 2 deletions drivers/platform/x86/hp-wmi.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit c9c041f

Please sign in to comment.