eeepc-laptop: fingers off backlight if video.ko is serving this functionality
authorThomas Renninger <trenn@suse.de>
Fri, 1 Aug 2008 15:37:59 +0000 (17:37 +0200)
committerLen Brown <len.brown@intel.com>
Sat, 8 Nov 2008 05:27:27 +0000 (00:27 -0500)
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>
drivers/misc/eeepc-laptop.c

index 9ef98b2d5039e76bd52054e47be358909c60f58e..02fe2b8b8939cd1f752e815c3c0e4e9310cedf77 100644 (file)
@@ -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;