From: Matthew Garrett Date: Thu, 16 Oct 2008 21:29:10 +0000 (-0400) Subject: sony-laptop: Ignore missing _DIS method on pic device X-Git-Tag: v2.6.28-rc5~77^2~4^2 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=bd2b064ecd5504a9e9eeaa5742b9f8bcc6d27637;p=linux-2.6-omap-h63xx.git 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 Acked-by: Mattia Dongili Signed-off-by: Len Brown --- diff --git a/drivers/misc/sony-laptop.c b/drivers/misc/sony-laptop.c index 5a97d3a9d74..f483c4221f7 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");