diff options
| author | Thomas Renninger <trenn@suse.de> | 2008-08-01 17:38:01 +0200 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2008-11-08 00:27:28 -0500 |
| commit | a598c82f39892069a8f6693459b1179fd9ef30e1 (patch) | |
| tree | 6a2b500c204893ff7fff6618febf3b871aac5cc9 /drivers/misc/msi-laptop.c | |
| parent | 7d5c89a615c5dae039094a3cf4a56fe6aab81765 (diff) | |
| download | linux-a598c82f39892069a8f6693459b1179fd9ef30e1.tar.gz | |
msi-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>
Diffstat (limited to 'drivers/misc/msi-laptop.c')
| -rw-r--r-- | drivers/misc/msi-laptop.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/drivers/misc/msi-laptop.c b/drivers/misc/msi-laptop.c index de898c6938f37a..759763d18e4c96 100644 --- a/drivers/misc/msi-laptop.c +++ b/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) |