Commit efef8729 authored by Frans Klaver's avatar Frans Klaver Committed by Darren Hart

eeepc-laptop: don't assume get_acpi succeeds

In eeepc_hotk_thaw, we assume that get_acpi() will effectively return a
bool. However, it is possible that get_acpi() returns an error instead.
We should not be writing error values to the ACPI device, even though
it's quite possible that we couldn't contact the ACPI device in the
first place.
Signed-off-by: default avatarFrans Klaver <fransklaver@gmail.com>
Signed-off-by: default avatarDarren Hart <dvhart@linux.intel.com>
parent 148a5dd5
...@@ -917,7 +917,7 @@ static int eeepc_hotk_thaw(struct device *device) ...@@ -917,7 +917,7 @@ static int eeepc_hotk_thaw(struct device *device)
struct eeepc_laptop *eeepc = dev_get_drvdata(device); struct eeepc_laptop *eeepc = dev_get_drvdata(device);
if (eeepc->wlan_rfkill) { if (eeepc->wlan_rfkill) {
bool wlan; int wlan;
/* /*
* Work around bios bug - acpi _PTS turns off the wireless led * Work around bios bug - acpi _PTS turns off the wireless led
...@@ -925,7 +925,8 @@ static int eeepc_hotk_thaw(struct device *device) ...@@ -925,7 +925,8 @@ static int eeepc_hotk_thaw(struct device *device)
* we should kick it ourselves in case hibernation is aborted. * we should kick it ourselves in case hibernation is aborted.
*/ */
wlan = get_acpi(eeepc, CM_ASL_WLAN); wlan = get_acpi(eeepc, CM_ASL_WLAN);
set_acpi(eeepc, CM_ASL_WLAN, wlan); if (wlan >= 0)
set_acpi(eeepc, CM_ASL_WLAN, wlan);
} }
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment