diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-08 18:32:50 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-08 18:32:50 +0100 |
| commit | 9035a6450d124a7787e5e3272b630a79d201555f (patch) | |
| tree | 551d8ad66a564a1ec2552168b9cf1b08d1ebc6c3 | |
| parent | Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/... (diff) | |
| parent | hp-wmi: remove double free caused by merge conflict (diff) | |
| download | linux-9035a6450d124a7787e5e3272b630a79d201555f.tar.xz linux-9035a6450d124a7787e5e3272b630a79d201555f.zip | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6:
hp-wmi: remove double free caused by merge conflict
| -rw-r--r-- | drivers/platform/x86/hp-wmi.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/platform/x86/hp-wmi.c b/drivers/platform/x86/hp-wmi.c index 5b648f0c6075..ad4c414dbfbc 100644 --- a/drivers/platform/x86/hp-wmi.c +++ b/drivers/platform/x86/hp-wmi.c @@ -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) |