Skip to contentSkip to conversation

sony-laptop: Ignore missing _DIS method on pic device

PATCH In review Adam Jackson 4 participants 5 messages Oct 16, 2008 – Oct 28, 2008

Subsystems (2)
ACPI Char and misc drivers
lore
Share & tools
lore

Adam Jackson

author
#0 lore raw

PATCH 1/1 sony-laptop: Ignore missing _DIS method on pic device

From: Matthew Garrett <[email protected]>

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 <[email protected]>
---
 drivers/misc/sony-laptop.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)
drivers/misc/sony-laptop.c +4 -2
index 60775be..b35eb92 100644
@@ -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");
Signature · 1 line
1.6.0.1
Acked-by on v1 1/1
#1 lore raw
Quoted 4 lines · Adam Jackson

From: Matthew Garrett <[email protected]>

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.

Quoted 1 line
Signed-off-by Adam Jackson <[email protected]>
Acked-by Mattia Dongili <[email protected]>
Quoted 29 lines
---
 drivers/misc/sony-laptop.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)
drivers/misc/sony-laptop.c +4 -2
index 60775be..b35eb92 100644
@@ -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");
Signature · 6 lines
1.6.0.1

--
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Signature · 2 lines
mattia
:wq!
#3 lore raw
In reply to Mattia Dongili

Hi,

Quoted 9 lines
Quoted 9 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines

In <[email protected]>
Mattia Dongili <[email protected]> wrote:

Quoted 4 lines · Adam Jackson

From: Matthew Garrett <[email protected]>

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...

Signature · 2 lines
ISHIKAWA Mutsumi
 <[email protected]>, <[email protected]>, <[email protected]>