Skip to content

Commit

Permalink
sony-laptop: ignore missing _DIS method on pic device
Browse files Browse the repository at this point in the history
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 <ajax@redhat.com>
Acked-by: Mattia Dongili <malattia@linux.it>
Cc: Len Brown <lenb@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
Matthew Garrett authored and Linus Torvalds committed Oct 30, 2008
1 parent def1be2 commit 6158d3a
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions drivers/misc/sony-laptop.c
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down

0 comments on commit 6158d3a

Please sign in to comment.