[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <4bdc5ba8a48cd171368def87ec1e701bdd8c5a9c.1491838390.git.jslaby@suse.cz>
Date: Mon, 10 Apr 2017 17:32:07 +0200
From: Jiri Slaby <jslaby@...e.cz>
To: stable@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, Alex Hung <alex.hung@...onical.com>,
"Rafael J . Wysocki" <rafael.j.wysocki@...el.com>,
Sumit Semwal <sumit.semwal@...aro.org>,
Jiri Slaby <jslaby@...e.cz>
Subject: [PATCH 3.12 046/142] ACPI / video: skip evaluating _DOD when it does not exist
From: Alex Hung <alex.hung@...onical.com>
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 <alex.hung@...onical.com>
Reviewed-by: Aaron Lu <aaron.lu@...el.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@...el.com>
Cc: Sumit Semwal <sumit.semwal@...aro.org>
Signed-off-by: Jiri Slaby <jslaby@...e.cz>
---
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
Powered by blists - more mailing lists