From b1d3dec0b68a488e55b079105a53707ead177f59 Mon Sep 17 00:00:00 2001
From: Matthew Garrett <mjg59@srcf.ucam.org>
Date: Wed, 29 Oct 2008 14:01:03 -0700
Subject: [PATCH] --- yaml --- r: 118034 b: refs/heads/master c:
 6158d3a2323835546c7cf83a170316fa77b726e0 h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/misc/sony-laptop.c | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 25d5c25d0b73..4e121ab47356 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: def1be2d727a1764205479b3e3e3ba16ffbad028
+refs/heads/master: 6158d3a2323835546c7cf83a170316fa77b726e0
diff --git a/trunk/drivers/misc/sony-laptop.c b/trunk/drivers/misc/sony-laptop.c
index 5a97d3a9d745..f483c4221f76 100644
--- a/trunk/drivers/misc/sony-laptop.c
+++ b/trunk/drivers/misc/sony-laptop.c
@@ -2315,8 +2315,10 @@ static int sony_pic_possible_resources(struct acpi_device *device)
  */
 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");