From 7545a27debdceddd953eccd2a3f9c2f0fc925399 Mon Sep 17 00:00:00 2001
From: Thomas Renninger <trenn@suse.de>
Date: Fri, 1 Aug 2008 17:38:01 +0200
Subject: [PATCH] --- yaml --- r: 118818 b: refs/heads/master c:
 a598c82f39892069a8f6693459b1179fd9ef30e1 h: refs/heads/master v: v3

---
 [refs]                          |  2 +-
 trunk/drivers/misc/msi-laptop.c | 16 ++++++++++------
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 7505af3300f4..65c876b2eedf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7d5c89a615c5dae039094a3cf4a56fe6aab81765
+refs/heads/master: a598c82f39892069a8f6693459b1179fd9ef30e1
diff --git a/trunk/drivers/misc/msi-laptop.c b/trunk/drivers/misc/msi-laptop.c
index de898c6938f3..759763d18e4c 100644
--- a/trunk/drivers/misc/msi-laptop.c
+++ b/trunk/drivers/misc/msi-laptop.c
@@ -347,12 +347,16 @@ static int __init msi_init(void)
 
 	/* Register backlight stuff */
 
-	msibl_device = backlight_device_register("msi-laptop-bl", NULL, NULL,
-						&msibl_ops);
-	if (IS_ERR(msibl_device))
-		return PTR_ERR(msibl_device);
-
-	msibl_device->props.max_brightness = MSI_LCD_LEVEL_MAX-1;
+	if (acpi_video_backlight_support()) {
+		printk(KERN_INFO "MSI: Brightness ignored, must be controlled "
+		       "by ACPI video driver\n");
+	} else {
+		msibl_device = backlight_device_register("msi-laptop-bl", NULL,
+							 NULL, &msibl_ops);
+		if (IS_ERR(msibl_device))
+			return PTR_ERR(msibl_device);
+		msibl_device->props.max_brightness = MSI_LCD_LEVEL_MAX-1;
+	}
 
 	ret = platform_driver_register(&msipf_driver);
 	if (ret)