The patch titled sony-laptop: ignore missing _DIS method on pic device has been added to the -mm tree. Its filename is sony-laptop-ignore-missing-_dis-method-on-pic-device.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find out what to do about this 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 sony-laptop-ignore-missing-_dis-method-on-pic-device.patch 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