SRU - LP283126 - sony-laptop: ignore missing _DIS method on pic device

[Tim Gardner]

Steve Conklin wrote:
> From 92838c8b1561157239e29a14fb25357e4d4c1d29 Mon Sep 17 00:00:00 2001
> From: Matthew Garrett <mjg59 at srcf.ucam.org>
> Date: Wed, 29 Oct 2008 14:01:03 -0700
> Subject: [PATCH] sony-laptop: ignore missing _DIS method on pic device
> 
> Bug: #283126
> 
> At least the Vaio VGN-Z540N doesn't have this method, so let's not fail
> to suspend just because it doesn't exist.
> 
> Signed-off-by: Adam Jackson <ajax at redhat.com>
> Acked-by: Mattia Dongili <malattia at linux.it>
> Cc: Len Brown <lenb at kernel.org>
> Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
> Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
> Signed-off-by: Steve Conklin <sconklin at canonical.com>
> 
> (cherry picked from commit 6158d3a2323835546c7cf83a170316fa77b726e0)
> ---
>  drivers/misc/sony-laptop.c |    6 ++++--
>  1 files changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/misc/sony-laptop.c b/drivers/misc/sony-laptop.c
> index 60775be..b35eb92 100644
> --- a/drivers/misc/sony-laptop.c
> +++ b/drivers/misc/sony-laptop.c
> @@ -2315,8 +2315,10 @@ end:
>   */
>  static int sony_pic_disable(struct acpi_device *device)
>  {
> -	if (ACPI_FAILURE(acpi_evaluate_object(device->handle,
> -			"_DIS", NULL, NULL)))
> +	acpi_status ret = acpi_evaluate_object(device->handle, "_DIS", NULL,
> +					       NULL);
> +
> +	if (ACPI_FAILURE(ret) && ret != AE_NOT_FOUND)
>  		return -ENXIO;
>  
>  	dprintk("Device disabled\n");

ACK - this looks like a candidate for stable. Please forward to
stable at kernel.org

rtg
-- 
Tim Gardner tim.gardner at canonical.com