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

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

[Adam Jackson]

From: Matthew Garrett <mjg59@srcf.ucam.org>

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@redhat.com>
---
 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

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

[Mattia Dongili]

On Thu, Oct 16, 2008 at 05:29:10PM -0400, Adam Jackson wrote:
> From: Matthew Garrett <mjg59@srcf.ucam.org>
> 
> 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@redhat.com>

Acked-by: Mattia Dongili <malattia@linux.it>

> ---
>  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@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 
-- 
mattia
:wq!

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

[ISHIKAWA Mutsumi]

Hi,

>>>>> In <20081016224903.GD21963@inferi.kami.home> 
>>>>>	Mattia Dongili <malattia@linux.it> wrote:
>> On Thu, Oct 16, 2008 at 05:29:10PM -0400, Adam Jackson wrote:
>> > From: Matthew Garrett <mjg59@srcf.ucam.org>
>> > 
>> > 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.

 I have VAIO VGN-Z90S (one of a variant of VAIO VGN-Z series).

 DSDT dump, lspci, lsusb, dmidecode and biosdecode outout are
put on bellow:

 http://hanzubon.jp/tmp/VGN-Z90S/

 I think VGN-Z's DSDT is very different from other (older) VAIO models...

-- 
ISHIKAWA Mutsumi
 <ishikawa@debian.org>, <ishikawa@hanzubon.jp>, <ishikawa@osdn.jp>

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

[Adam Jackson]

On Fri, 2008-10-17 at 07:49 +0900, Mattia Dongili wrote:
> On Thu, Oct 16, 2008 at 05:29:10PM -0400, Adam Jackson wrote:
> > From: Matthew Garrett <mjg59@srcf.ucam.org>
> > 
> > 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.

'iasl -d' output:

http://people.freedesktop.org/~ajax/synephrine-dsdt.dsl

- ajax

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

[Len Brown]

> > 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@redhat.com>

> Acked-by: Mattia Dongili <malattia@linux.it>

applied to acpi-test

thanks,
-len