diff options
| author | Thomas Renninger <trenn@suse.de> | 2008-08-01 19:37:58 +0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2008-11-08 08:27:27 +0300 |
| commit | 29454f17124c655236d2972dad21907e15ca294b (patch) | |
| tree | 9d047f5903488ec10eda4b1d0d3d7d0485efa5e0 /drivers | |
| parent | 6766fec3669d5053b987e111afb348b885237bfc (diff) | |
| download | linux-29454f17124c655236d2972dad21907e15ca294b.tar.xz | |
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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/misc/compal-laptop.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/drivers/misc/compal-laptop.c b/drivers/misc/compal-laptop.c index 344b790a6253..11003bba10d3 100644 --- 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) |