From patchwork Tue Oct 18 19:18:57 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Hung X-Patchwork-Id: 683836 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id 3sz4dL0F9Rz9ryr; Wed, 19 Oct 2016 06:19:34 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1bwZv8-0002S0-Hx; Tue, 18 Oct 2016 19:19:30 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1bwZuh-0002Pn-51 for kernel-team@lists.ubuntu.com; Tue, 18 Oct 2016 19:19:03 +0000 Received: from 1.general.alexhung.us.vpn ([10.172.65.254] helo=canonical.com) by youngberry.canonical.com with esmtpsa (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1bwZug-0002pk-Fe for kernel-team@lists.ubuntu.com; Tue, 18 Oct 2016 19:19:02 +0000 From: Alex Hung To: kernel-team@lists.ubuntu.com Subject: [PATCH] ACPI / video: skip evaluating _DOD when it does not exist Date: Tue, 18 Oct 2016 12:18:57 -0700 Message-Id: <1476818337-23685-2-git-send-email-alex.hung@canonical.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1476818337-23685-1-git-send-email-alex.hung@canonical.com> References: <1476818337-23685-1-git-send-email-alex.hung@canonical.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.14 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: kernel-team-bounces@lists.ubuntu.com Some system supports hybrid graphics and its discrete VGA does not have any connectors and therefore has no _DOD method. BugLink: http://bugs.launchpad.net/bugs/1634607 Signed-off-by: Alex Hung Reviewed-by: Aaron Lu Signed-off-by: Rafael J. Wysocki (cherry picked from commit e34fbbac669de0b7fb7803929d0477f35f6e2833) Signed-off-by: Alex Hung Acked-by: Colin Ian King --- drivers/acpi/acpi_video.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/acpi/acpi_video.c b/drivers/acpi/acpi_video.c index 5fdac39..549cdbe 100644 --- a/drivers/acpi/acpi_video.c +++ b/drivers/acpi/acpi_video.c @@ -1211,6 +1211,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"));