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 <[email protected]>
Acked-by: Mattia Dongili <[email protected]>
Cc: Len Brown <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
This commit is contained in:
Matthew Garrett 2008-10-29 14:01:03 -07:00 • committed by Linus Torvalds
commit 6158d3a232

View file

@ -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");