]>
Commit | Line | Data |
---|---|---|
2cb7cef9 BS |
1 | From: Thomas Renninger <trenn@suse.de> |
2 | Subject: [PATCH] msi-laptop: 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 a8c338259a436627d2427d70dc31fac67b86b9e6 | |
6 | ||
7 | Signed-off-by: Thomas Renninger <trenn@suse.de> | |
8 | Signed-off-by: Andi Kleen <ak@linux.intel.com> | |
9 | --- | |
10 | drivers/misc/msi-laptop.c | 16 ++++++++++------ | |
11 | 1 files changed, 10 insertions(+), 6 deletions(-) | |
12 | ||
13 | diff --git a/drivers/misc/msi-laptop.c b/drivers/misc/msi-laptop.c | |
14 | index de898c6..759763d 100644 | |
15 | --- a/drivers/misc/msi-laptop.c | |
16 | +++ b/drivers/misc/msi-laptop.c | |
17 | @@ -347,12 +347,16 @@ static int __init msi_init(void) | |
18 | ||
19 | /* Register backlight stuff */ | |
20 | ||
21 | - msibl_device = backlight_device_register("msi-laptop-bl", NULL, NULL, | |
22 | - &msibl_ops); | |
23 | - if (IS_ERR(msibl_device)) | |
24 | - return PTR_ERR(msibl_device); | |
25 | - | |
26 | - msibl_device->props.max_brightness = MSI_LCD_LEVEL_MAX-1; | |
27 | + if (acpi_video_backlight_support()) { | |
28 | + printk(KERN_INFO "MSI: Brightness ignored, must be controlled " | |
29 | + "by ACPI video driver\n"); | |
30 | + } else { | |
31 | + msibl_device = backlight_device_register("msi-laptop-bl", NULL, | |
32 | + NULL, &msibl_ops); | |
33 | + if (IS_ERR(msibl_device)) | |
34 | + return PTR_ERR(msibl_device); | |
35 | + msibl_device->props.max_brightness = MSI_LCD_LEVEL_MAX-1; | |
36 | + } | |
37 | ||
38 | ret = platform_driver_register(&msipf_driver); | |
39 | if (ret) | |
40 | -- | |
41 | 1.5.4.5 | |
42 |