Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6 · 9035a6450d - Gogs

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

Linus Torvalds 15 years ago

parent

a07f523f26 c9c041fcb1

commit

9035a6450d

1 changed files with 0 additions and 2 deletions

Split View Show Diff Stats

						
							+ 0
							
							- 2
						
drivers/platform/x86/hp-wmi.c
							 
								View File
							
				@@ -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)