From: Thomas Renninger <trenn@suse.de>
Date: Fri, 1 Aug 2008 15:37:59 +0000 (+0200)
Subject: eeepc-laptop: fingers off backlight if video.ko is serving this functionality
X-Git-Tag: v2.6.28-rc5~77^2~2^2~4
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=a2bf8c01048f855fbf65a8fc41460aef71ca39dc;p=linux-2.6-omap-h63xx.git

eeepc-laptop: fingers off backlight if video.ko is serving this functionality

Signed-off-by: Thomas Renninger <trenn@suse.de>
Acked-by: Zhang Rui <rui.zhang@intel.com>
Signed-off-by: Andi Kleen <ak@linux.intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
---

diff --git a/drivers/misc/eeepc-laptop.c b/drivers/misc/eeepc-laptop.c
index 9ef98b2d503..02fe2b8b893 100644
--- a/drivers/misc/eeepc-laptop.c
+++ b/drivers/misc/eeepc-laptop.c
@@ -825,9 +825,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;