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

[Andy Whitcroft]

From: Thomas Renninger <trenn at suse.de>

Bug: #257827
commit 540b8bb9c33935183ceb5bed466a42ad72b2af56 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/sony-laptop.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/drivers/misc/sony-laptop.c b/drivers/misc/sony-laptop.c
index b35eb92..167f146 100644
--- a/drivers/misc/sony-laptop.c
+++ b/drivers/misc/sony-laptop.c
@@ -1038,7 +1038,11 @@ static int sony_nc_add(struct acpi_device *device)
 		goto outinput;
 	}
 
-	if (ACPI_SUCCESS(acpi_get_handle(sony_nc_acpi_handle, "GBRT", &handle))) {
+	if (!acpi_video_backlight_support()) {
+		printk(KERN_INFO DRV_PFX "Sony: Brightness ignored, must be "
+		       "controlled by ACPI video driver\n");
+	} else if (ACPI_SUCCESS(acpi_get_handle(sony_nc_acpi_handle, "GBRT",
+						&handle))) {
 		sony_backlight_device = backlight_device_register("sony", NULL,
 								  NULL,
 								  &sony_backlight_ops);
-- 
1.6.0.4.911.gc990