[prev in list] [next in list] [prev in thread] [next in thread] 

List:       git-commits-head
Subject:    ACPI video: Still use ACPI backlight control if _DOS doesn't exist
From:       "Linux Kernel Mailing List" <linux-kernel () vger ! kernel ! org>
Date:       2012-06-30 18:23:31
Message-ID: 20120630182331.9AEBF340419 () ra ! kernel ! org
[Download RAW message or body]

Gitweb:     http://git.kernel.org/linus/;a=commit;h=b03738430c7537d5f87948e0b35d8aaf2688c6b4
Commit:     b03738430c7537d5f87948e0b35d8aaf2688c6b4
Parent:     76e10d158efb6d4516018846f60c2ab5501900bc
Author:     Zhang Rui <rui.zhang@intel.com>
AuthorDate: Wed Jun 20 09:48:43 2012 +0800
Committer:  Len Brown <len.brown@intel.com>
CommitDate: Sat Jun 30 00:43:42 2012 -0400

    ACPI video: Still use ACPI backlight control if _DOS doesn't exist
    
    This fixes a regression in 3.4-rc1 caused by commit
    ea9f8856bd6d4ed45885b06a338f7362cd6c60e5
    (ACPI video: Harden video bus adding.)
    
    Some platforms don't have _DOS control method, but the ACPI
    backlight still works.
    We should not invoke _DOS for these platforms.
    
    https://bugzilla.kernel.org/show_bug.cgi?id=43168
    
    Cc: Igor Murzov <intergalactic.anonymous@gmail.com>
    Cc: stable@vger.kernel.org
    Signed-off-by: Zhang Rui <rui.zhang@intel.com>
    Signed-off-by: Len Brown <len.brown@intel.com>
---
 drivers/acpi/video.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
index 9577b6f..4134b30 100644
--- a/drivers/acpi/video.c
+++ b/drivers/acpi/video.c
@@ -558,6 +558,8 @@ acpi_video_bus_DOS(struct acpi_video_bus *video, int bios_flag, int lcd_flag)
 	union acpi_object arg0 = { ACPI_TYPE_INTEGER };
 	struct acpi_object_list args = { 1, &arg0 };
 
+	if (!video->cap._DOS)
+		return 0;
 
 	if (bios_flag < 0 || bios_flag > 3 || lcd_flag < 0 || lcd_flag > 1)
 		return -EINVAL;
--
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
[prev in list] [next in list] [prev in thread] [next in thread]