compal: 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/compal-laptop.c b/drivers/misc/compal-laptop.c
index 344b790a6253992540b831c72b2677b2ec6fd69e..11003bba10d3e495cee585b83d49dc27f5b4ee80 100644 (file)
--- a/drivers/misc/compal-laptop.c
+++ b/drivers/misc/compal-laptop.c
@@ -326,12 +326,14 @@ static int __init compal_init(void)
 
        /* Register backlight stuff */
 
-       compalbl_device = backlight_device_register("compal-laptop", NULL, NULL,
-                                               &compalbl_ops);
-       if (IS_ERR(compalbl_device))
-               return PTR_ERR(compalbl_device);
+       if (!acpi_video_backlight_support()) {
+               compalbl_device = backlight_device_register("compal-laptop", NULL, NULL,
+                                                           &compalbl_ops);
+               if (IS_ERR(compalbl_device))
+                       return PTR_ERR(compalbl_device);
 
-       compalbl_device->props.max_brightness = COMPAL_LCD_LEVEL_MAX-1;
+               compalbl_device->props.max_brightness = COMPAL_LCD_LEVEL_MAX-1;
+       }
 
        ret = platform_driver_register(&compal_driver);
        if (ret)