mirror of
https://github.com/vincentmli/bpfire.git
synced 2026-04-28 11:43:25 +02:00
43 lines
1.3 KiB
Diff
43 lines
1.3 KiB
Diff
From: Thomas Renninger <trenn@suse.de>
|
|
Subject: [PATCH] msi-laptop: fingers off backlight if video.ko is serving this functionality
|
|
Patch-Mainline: queued for .28 in Len's/ak's ACPI tree
|
|
|
|
commit a8c338259a436627d2427d70dc31fac67b86b9e6
|
|
|
|
Signed-off-by: Thomas Renninger <trenn@suse.de>
|
|
Signed-off-by: Andi Kleen <ak@linux.intel.com>
|
|
---
|
|
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 de898c6..759763d 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)
|
|
--
|
|
1.5.4.5
|
|
|