diff options
| author | Alex Hung <alex.hung@canonical.com> | 2016-05-27 15:47:06 +0800 |
|---|---|---|
| committer | Mister Oyster <oysterized@gmail.com> | 2017-07-04 12:11:06 +0200 |
| commit | 08ca186555ad511cf14c0a308324cdb273e8520c (patch) | |
| tree | fd5203910cec974a1211b0c7fdf5dcf1f2ac8061 /drivers/acpi | |
| parent | 57257cb629313f53501ae2d8d95fe46cd80563ab (diff) | |
ACPI / video: skip evaluating _DOD when it does not exist
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@canonical.com>
Reviewed-by: Aaron Lu <aaron.lu@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Cc: Sumit Semwal <sumit.semwal@linaro.org>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Signed-off-by: Willy Tarreau <w@1wt.eu>
Diffstat (limited to 'drivers/acpi')
| -rw-r--r-- | drivers/acpi/video.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c index 0dc9ff61d..e3ecaf4d6 100644 --- a/drivers/acpi/video.c +++ b/drivers/acpi/video.c @@ -1263,6 +1263,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")); |