SRU - LP#283126 - Intrepid can't suspend / hibernate on SONY Vaio VGN-Z540

[Tim Gardner]

Zhao, Yingying wrote:
> LP: #283126
> 
> SRU justification: This patch fixes the bug that Intrepid can't suspend or hibernate on SONY Vaio VGN-Z540. The patch is already in mainline kernel 2.6.28-rc3.
> 
> Test: I verified this patch with Intrepid GA on the SONY Vaio VGN-Z540.
> 
> Patch (also attached):
> 
> commit 6158d3a2323835546c7cf83a170316fa77b726e0
> Author: Matthew Garrett <mjg59 at srcf.ucam.org<mailto:mjg59 at srcf.ucam.org>>
> Date:   Wed Oct 29 14:01:03 2008 -0700
> 
>     sony-laptop: ignore missing _DIS method on pic device
> 
>     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<mailto:ajax at redhat.com>>
>     Acked-by: Mattia Dongili <malattia at linux.it<mailto:malattia at linux.it>>
>     Cc: Len Brown <lenb at kernel.org<mailto:lenb at kernel.org>>
>     Signed-off-by: Andrew Morton <akpm at linux-foundation.org<mailto:akpm at linux-foundation.org>>
>     Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org<mailto:torvalds at linux-foundation.org>>
> 
> diff --git a/drivers/misc/sony-laptop.c b/drivers/misc/sony-laptop.c
> index 5a97d3a..f483c42 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");
> 
> Best Regards,
> Yingying
> 
> 
> 
> 

applied, LP updated

-- 
Tim Gardner tim.gardner at canonical.com