Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6158d3a2 authored by Matthew Garrett's avatar Matthew Garrett Committed by Linus Torvalds
Browse files

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: default avatarAdam Jackson <ajax@redhat.com>
Acked-by: default avatarMattia Dongili <malattia@linux.it>
Cc: Len Brown <lenb@kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent def1be2d

drivers/misc/sony-laptop.c

+4 −2
Original line number Diff line number Diff line
@@ -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");