The patch titled
sony-laptop: ignore missing _DIS method on pic device
has been removed from the -mm tree. Its filename was
sony-laptop-ignore-missing-_dis-method-on-pic-device.patch
This patch was dropped because it was merged into mainline or a subsystem tree
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: sony-laptop: ignore missing _DIS method on pic device
From: Matthew Garrett <mjg59@xxxxxxxxxxxxx>
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@xxxxxxxxxx>
Acked-by: Mattia Dongili <malattia@xxxxxxxx>
Cc: Len Brown <lenb@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/misc/sony-laptop.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff -puN drivers/misc/sony-laptop.c~sony-laptop-ignore-missing-_dis-method-on-pic-device drivers/misc/sony-laptop.c
--- a/drivers/misc/sony-laptop.c~sony-laptop-ignore-missing-_dis-method-on-pic-device
+++ a/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");
_
Patches currently in -mm which might be from mjg59@xxxxxxxxxxxxx are
linux-next.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
