diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-08 12:32:50 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-08 12:32:50 -0500 |
| commit | 9035a6450d124a7787e5e3272b630a79d201555f (patch) | |
| tree | 551d8ad66a564a1ec2552168b9cf1b08d1ebc6c3 | |
| parent | a07f523f264095759c6bb6e0e7a81c4d15bc3336 (diff) | |
| parent | c9c041fcb1a4d69ed4791f00b57554eeb341d148 (diff) | |
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) | |||
| 393 | } else | 393 | } else |
| 394 | printk(KERN_INFO "HP WMI: Unknown key pressed - %x\n", | 394 | printk(KERN_INFO "HP WMI: Unknown key pressed - %x\n", |
| 395 | eventcode); | 395 | eventcode); |
| 396 | |||
| 397 | kfree(obj); | ||
| 398 | } | 396 | } |
| 399 | 397 | ||
| 400 | static int __init hp_wmi_input_setup(void) | 398 | static int __init hp_wmi_input_setup(void) |