projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
def1be2
)
sony-laptop: ignore missing _DIS method on pic device
author
Matthew Garrett
<
[email protected]
>
Wed, 29 Oct 2008 21:01:03 +0000
(14:01 -0700)
committer
Linus Torvalds
<
[email protected]
>
Thu, 30 Oct 2008 18:38:46 +0000
(11:38 -0700)
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]
>
drivers/misc/sony-laptop.c
patch
|
blob
|
history
diff --git
a/drivers/misc/sony-laptop.c
b/drivers/misc/sony-laptop.c
index 5a97d3a9d745ee3ab5d17e5e1b86bce5a9fae132..f483c4221f7602cb80022699e98008c5e2d33d79 100644
(file)
--- 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");