diff options
author | Matthew Garrett <mjg59@srcf.ucam.org> | 2008-10-16 17:29:10 -0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2008-10-28 00:58:05 -0400 |
commit | bd2b064ecd5504a9e9eeaa5742b9f8bcc6d27637 (patch) | |
tree | c23aa12cc35a3cf05a1cb02c77620866f5bc4e71 | |
parent | 49fdf6785fd660e18a1eb4588928f47e9fa29a9a (diff) |
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 <ajax@redhat.com>
Acked-by: Mattia Dongili <malattia@linux.it>
Signed-off-by: Len Brown <len.brown@intel.com>
-rw-r--r-- | drivers/misc/sony-laptop.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/misc/sony-laptop.c b/drivers/misc/sony-laptop.c index 5a97d3a9d745..f483c4221f76 100644 --- a/drivers/misc/sony-laptop.c +++ b/drivers/misc/sony-laptop.c | |||
@@ -2315,8 +2315,10 @@ end: | |||
2315 | */ | 2315 | */ |
2316 | static int sony_pic_disable(struct acpi_device *device) | 2316 | static int sony_pic_disable(struct acpi_device *device) |
2317 | { | 2317 | { |
2318 | if (ACPI_FAILURE(acpi_evaluate_object(device->handle, | 2318 | acpi_status ret = acpi_evaluate_object(device->handle, "_DIS", NULL, |
2319 | "_DIS", NULL, NULL))) | 2319 | NULL); |
2320 | |||
2321 | if (ACPI_FAILURE(ret) && ret != AE_NOT_FOUND) | ||
2320 | return -ENXIO; | 2322 | return -ENXIO; |
2321 | 2323 | ||
2322 | dprintk("Device disabled\n"); | 2324 | dprintk("Device disabled\n"); |