lkml.org 
[lkml]   [2014]   [Oct]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH 8/8] eeepc-laptop: don't assume get_acpi succeeds
On Wed, Oct 22, 2014 at 09:12:43PM +0200, Frans Klaver wrote:
> 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: Frans Klaver <fransklaver@gmail.com>
> ---
> drivers/platform/x86/eeepc-laptop.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/platform/x86/eeepc-laptop.c b/drivers/platform/x86/eeepc-laptop.c
> index 275a239..14f79ef 100644
> --- a/drivers/platform/x86/eeepc-laptop.c
> +++ b/drivers/platform/x86/eeepc-laptop.c
> @@ -911,7 +911,7 @@ static int eeepc_hotk_thaw(struct device *device)
> struct eeepc_laptop *eeepc = dev_get_drvdata(device);
>
> if (eeepc->wlan_rfkill) {
> - bool wlan;
> + int wlan;
>
> /*
> * Work around bios bug - acpi _PTS turns off the wireless led
> @@ -919,7 +919,8 @@ static int eeepc_hotk_thaw(struct device *device)
> * we should kick it ourselves in case hibernation is aborted.
> */
> wlan = get_acpi(eeepc, CM_ASL_WLAN);
> - set_acpi(eeepc, CM_ASL_WLAN, wlan);
> + if (wlan >= 0)
> + set_acpi(eeepc, CM_ASL_WLAN, wlan);

And if not? Seems like we should be passing the error code along.

> }
>
> return 0;
> --
> 2.1.0
>
>

--
Darren Hart
Intel Open Source Technology Center


\
 
 \ /
  Last update: 2014-10-28 08:01    [W:0.228 / U:0.224 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site