Re: [PATCH] sony-laptop: Ignore missing _DIS method on pic device

From: Mattia Dongili
Date: Thu Oct 16 2008 - 19:17:35 EST


On Thu, Oct 16, 2008 at 05:29:10PM -0400, Adam Jackson wrote:
> From: Matthew Garrett <mjg59@xxxxxxxxxxxxx>
>
> At least the Vaio VGN-Z540N doesn't have this method, so let's not fail
> to suspend just because it doesn't exist.

Do you happen to have a DSDT dump for this model? I'd be glad to see it.

> Signed-off-by: Adam Jackson <ajax@xxxxxxxxxx>

Acked-by: Mattia Dongili <malattia@xxxxxxxx>

> ---
> 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");
> --
> 1.6.0.1
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
--
mattia
:wq!
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/