[PATCH 06/10] eeepc-laptop: fingers off backlight if video.ko is serving this functionality

Andy Whitcroft apw at canonical.com
Thu Nov 20 16:33:26 UTC 2008


From: Thomas Renninger <trenn at suse.de>

Bug: #257827
commit a2bf8c01048f855fbf65a8fc41460aef71ca39dc upstream

Signed-off-by: Thomas Renninger <trenn at suse.de>
Acked-by: Zhang Rui <rui.zhang at intel.com>
Signed-off-by: Andi Kleen <ak at linux.intel.com>
Signed-off-by: Len Brown <len.brown at intel.com>
Signed-off-by: Andy Whitcroft <apw at canonical.com>
---
 drivers/misc/eeepc-laptop.c |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/drivers/misc/eeepc-laptop.c b/drivers/misc/eeepc-laptop.c
index 1ee8501..50d42f2 100644
--- a/drivers/misc/eeepc-laptop.c
+++ b/drivers/misc/eeepc-laptop.c
@@ -635,9 +635,15 @@ static int __init eeepc_laptop_init(void)
 		return -ENODEV;
 	}
 	dev = acpi_get_physical_device(ehotk->device->handle);
-	result = eeepc_backlight_init(dev);
-	if (result)
-		goto fail_backlight;
+
+	if (!acpi_video_backlight_support()) {
+		result = eeepc_backlight_init(dev);
+		if (result)
+			goto fail_backlight;
+	} else
+		printk(EEEPC_INFO "Backlight controlled by ACPI video "
+		       "driver\n");
+
 	result = eeepc_hwmon_init(dev);
 	if (result)
 		goto fail_hwmon;
-- 
1.6.0.4.911.gc990





More information about the kernel-team mailing list