From: Len Brown <len.brown@intel.com>
Date: Sat, 19 Sep 2009 06:09:50 +0000 (-0400)
Subject: Merge branch 'fujitsu' into release
X-Git-Tag: 2.1b_release~10945^2~9
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=89ae400e3f57c9d60cd4da3501bb09c1502b723c;p=platform%2Fkernel%2Fkernel-mfld-blackbay.git

Merge branch 'fujitsu' into release
---

89ae400e3f57c9d60cd4da3501bb09c1502b723c
diff --cc drivers/platform/x86/fujitsu-laptop.c
index eabddc9c,1ed3513..f35aee5
--- a/drivers/platform/x86/fujitsu-laptop.c
+++ b/drivers/platform/x86/fujitsu-laptop.c
@@@ -697,10 -691,10 +691,10 @@@ static int acpi_fujitsu_add(struct acpi
  	result = acpi_bus_get_power(fujitsu->acpi_handle, &state);
  	if (result) {
  		printk(KERN_ERR "Error reading power state\n");
- 		goto end;
+ 		goto err_unregister_input_dev;
  	}
  
 -	printk(KERN_INFO PREFIX "%s [%s] (%s)\n",
 +	printk(KERN_INFO "ACPI: %s [%s] (%s)\n",
  	       acpi_device_name(device), acpi_device_bid(device),
  	       !device->power.state ? "on" : "off");
  
@@@ -871,10 -862,10 +862,10 @@@ static int acpi_fujitsu_hotkey_add(stru
  	result = acpi_bus_get_power(fujitsu_hotkey->acpi_handle, &state);
  	if (result) {
  		printk(KERN_ERR "Error reading power state\n");
- 		goto end;
+ 		goto err_unregister_input_dev;
  	}
  
 -	printk(KERN_INFO PREFIX "%s [%s] (%s)\n",
 +	printk(KERN_INFO "ACPI: %s [%s] (%s)\n",
  	       acpi_device_name(device), acpi_device_bid(device),
  	       !device->power.state ? "on" : "off");