diff options
Diffstat (limited to 'drivers/misc/thinkpad_acpi.c')
| -rw-r--r-- | drivers/misc/thinkpad_acpi.c | 29 |
1 files changed, 19 insertions, 10 deletions
diff --git a/drivers/misc/thinkpad_acpi.c b/drivers/misc/thinkpad_acpi.c index 4db1cf9078d9..7a4a26b0edd2 100644 --- a/drivers/misc/thinkpad_acpi.c +++ b/drivers/misc/thinkpad_acpi.c | |||
| @@ -4932,16 +4932,25 @@ static int __init brightness_init(struct ibm_init_struct *iibm) | |||
| 4932 | */ | 4932 | */ |
| 4933 | b = tpacpi_check_std_acpi_brightness_support(); | 4933 | b = tpacpi_check_std_acpi_brightness_support(); |
| 4934 | if (b > 0) { | 4934 | if (b > 0) { |
| 4935 | if (thinkpad_id.vendor == PCI_VENDOR_ID_LENOVO) { | 4935 | |
| 4936 | printk(TPACPI_NOTICE | 4936 | if (acpi_video_backlight_support()) { |
| 4937 | "Lenovo BIOS switched to ACPI backlight " | 4937 | if (brightness_enable > 1) { |
| 4938 | "control mode\n"); | 4938 | printk(TPACPI_NOTICE |
| 4939 | } | 4939 | "Standard ACPI backlight interface " |
| 4940 | if (brightness_enable > 1) { | 4940 | "available, not loading native one.\n"); |
| 4941 | printk(TPACPI_NOTICE | 4941 | return 1; |
| 4942 | "standard ACPI backlight interface " | 4942 | } else if (brightness_enable == 1) { |
| 4943 | "available, not loading native one...\n"); | 4943 | printk(TPACPI_NOTICE |
| 4944 | return 1; | 4944 | "Backlight control force enabled, even if standard " |
| 4945 | "ACPI backlight interface is available\n"); | ||
| 4946 | } | ||
| 4947 | } else { | ||
| 4948 | if (brightness_enable > 1) { | ||
| 4949 | printk(TPACPI_NOTICE | ||
| 4950 | "Standard ACPI backlight interface not " | ||
| 4951 | "available, thinkpad_acpi native " | ||
| 4952 | "brightness control enabled\n"); | ||
| 4953 | } | ||
| 4945 | } | 4954 | } |
| 4946 | } | 4955 | } |
| 4947 | 4956 | ||