From: Alex Hung <[email protected]> 3.12-stable review patch. If anyone has any objections, please let me know.
=============== commit e34fbbac669de0b7fb7803929d0477f35f6e2833 upstream. Some system supports hybrid graphics and its discrete VGA does not have any connectors and therefore has no _DOD method. Signed-off-by: Alex Hung <[email protected]> Reviewed-by: Aaron Lu <[email protected]> Signed-off-by: Rafael J. Wysocki <[email protected]> Cc: Sumit Semwal <[email protected]> Signed-off-by: Jiri Slaby <[email protected]> --- drivers/acpi/video.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c index ff5ec8ecc257..cf7efcda09e1 100644 --- a/drivers/acpi/video.c +++ b/drivers/acpi/video.c @@ -1174,6 +1174,9 @@ static int acpi_video_device_enumerate(struct acpi_video_bus *video) union acpi_object *dod = NULL; union acpi_object *obj; + if (!video->cap._DOD) + return AE_NOT_EXIST; + status = acpi_evaluate_object(video->device->handle, "_DOD", NULL, &buffer); if (!ACPI_SUCCESS(status)) { ACPI_EXCEPTION((AE_INFO, status, "Evaluating _DOD")); -- 2.12.2
