diff options
author | Rafael J. Wysocki <rjw@sisk.pl> | 2010-12-11 17:43:26 -0500 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2011-01-12 04:48:45 -0500 |
commit | 40b7397579e006c0f9cf4de58e9ccc350e06308f (patch) | |
tree | ad64a5541e513b6094c160031d135f700f1374c5 | |
parent | 488a76c52606199100adf09c8eb7cbedbd94e9d9 (diff) |
Platform / x86: Make fujitsu_laptop use acpi_bus_update_power()
Use the new function acpi_bus_update_power(), which is safer than
acpi_bus_get_power(), for getting device power state in
acpi_fujitsu_add() and acpi_fujitsu_hotkey_add().
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Reported-and-Tested-by: Sedat Dilek <sedat.dilek@gmail.com>
Signed-off-by: Len Brown <len.brown@intel.com>
-rw-r--r-- | drivers/platform/x86/fujitsu-laptop.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/platform/x86/fujitsu-laptop.c b/drivers/platform/x86/fujitsu-laptop.c index f44cd2620ff9..cf6c47250c56 100644 --- a/drivers/platform/x86/fujitsu-laptop.c +++ b/drivers/platform/x86/fujitsu-laptop.c | |||
@@ -689,7 +689,7 @@ static int acpi_fujitsu_add(struct acpi_device *device) | |||
689 | if (error) | 689 | if (error) |
690 | goto err_free_input_dev; | 690 | goto err_free_input_dev; |
691 | 691 | ||
692 | result = acpi_bus_get_power(fujitsu->acpi_handle, &state); | 692 | result = acpi_bus_update_power(fujitsu->acpi_handle, &state); |
693 | if (result) { | 693 | if (result) { |
694 | printk(KERN_ERR "Error reading power state\n"); | 694 | printk(KERN_ERR "Error reading power state\n"); |
695 | goto err_unregister_input_dev; | 695 | goto err_unregister_input_dev; |
@@ -857,7 +857,7 @@ static int acpi_fujitsu_hotkey_add(struct acpi_device *device) | |||
857 | if (error) | 857 | if (error) |
858 | goto err_free_input_dev; | 858 | goto err_free_input_dev; |
859 | 859 | ||
860 | result = acpi_bus_get_power(fujitsu_hotkey->acpi_handle, &state); | 860 | result = acpi_bus_update_power(fujitsu_hotkey->acpi_handle, &state); |
861 | if (result) { | 861 | if (result) { |
862 | printk(KERN_ERR "Error reading power state\n"); | 862 | printk(KERN_ERR "Error reading power state\n"); |
863 | goto err_unregister_input_dev; | 863 | goto err_unregister_input_dev; |