]>
Commit | Line | Data |
---|---|---|
2cb7cef9 BS |
1 | From: Thomas Renninger <trenn@suse.de> |
2 | Subject: [PATCH] compal: fingers off backlight if video.ko is serving this functionality | |
3 | Patch-Mainline: queued for .28 in Len's/ak's ACPI tree | |
4 | ||
5 | commit efbc58e3236022d040e1c1f177ee5971d46b034f | |
6 | ||
7 | Signed-off-by: Thomas Renninger <trenn@suse.de> | |
8 | Signed-off-by: Andi Kleen <ak@linux.intel.com> | |
9 | --- | |
10 | drivers/misc/compal-laptop.c | 12 +++++++----- | |
11 | 1 files changed, 7 insertions(+), 5 deletions(-) | |
12 | ||
13 | diff --git a/drivers/misc/compal-laptop.c b/drivers/misc/compal-laptop.c | |
14 | index 344b790..11003bb 100644 | |
15 | --- a/drivers/misc/compal-laptop.c | |
16 | +++ b/drivers/misc/compal-laptop.c | |
17 | @@ -326,12 +326,14 @@ static int __init compal_init(void) | |
18 | ||
19 | /* Register backlight stuff */ | |
20 | ||
21 | - compalbl_device = backlight_device_register("compal-laptop", NULL, NULL, | |
22 | - &compalbl_ops); | |
23 | - if (IS_ERR(compalbl_device)) | |
24 | - return PTR_ERR(compalbl_device); | |
25 | + if (!acpi_video_backlight_support()) { | |
26 | + compalbl_device = backlight_device_register("compal-laptop", NULL, NULL, | |
27 | + &compalbl_ops); | |
28 | + if (IS_ERR(compalbl_device)) | |
29 | + return PTR_ERR(compalbl_device); | |
30 | ||
31 | - compalbl_device->props.max_brightness = COMPAL_LCD_LEVEL_MAX-1; | |
32 | + compalbl_device->props.max_brightness = COMPAL_LCD_LEVEL_MAX-1; | |
33 | + } | |
34 | ||
35 | ret = platform_driver_register(&compal_driver); | |
36 | if (ret) | |
37 | -- | |
38 | 1.5.4.5 | |
39 |