From: Matthew Garrett Date: Wed, 29 Oct 2008 21:01:03 +0000 (-0700) Subject: sony-laptop: ignore missing _DIS method on pic device X-Git-Tag: v2.6.27.7~25 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=08ed5844d41cdd0b8576de8b4b7036b0adbf1688;p=karo-tx-linux.git sony-laptop: ignore missing _DIS method on pic device commit 6158d3a2323835546c7cf83a170316fa77b726e0 upstream. 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 Cc: Len Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Cc: Steve Conklin Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/misc/sony-laptop.c b/drivers/misc/sony-laptop.c index 60775be22822..b35eb9217ad0 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");