|
@@ -347,12 +347,16 @@ static int __init msi_init(void)
|
|
|
|
|
|
/* Register backlight stuff */
|
|
/* 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);
|
|
ret = platform_driver_register(&msipf_driver);
|
|
if (ret)
|
|
if (ret)
|