diff options
| author | Henrique de Moraes Holschuh <hmh@hmh.eng.br> | 2009-05-30 13:25:09 -0300 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-06-17 22:49:05 -0400 |
| commit | 8bf3d4c535c2b9689c2979b281c24e9f59c2f4ad (patch) | |
| tree | 0c98d30fd93a4a4ae2fdd10ef2e49a4bbbf6ddf2 /drivers | |
| parent | f21179a47ff8d1046a61c1cf5920244997a4a7bb (diff) | |
| download | linux-8bf3d4c535c2b9689c2979b281c24e9f59c2f4ad.tar.gz linux-8bf3d4c535c2b9689c2979b281c24e9f59c2f4ad.tar.bz2 linux-8bf3d4c535c2b9689c2979b281c24e9f59c2f4ad.zip | |
thinkpad-acpi: silence bogus warning when ACPI video is disabled
Make use of acpi_video_backlight_support() also in hotkey_init, to make
sure this doesn't happen:
thinkpad_acpi: This ThinkPad has standard ACPI backlight brightness
control, supported by the ACPI video driver
thinkpad_acpi: Disabling thinkpad-acpi brightness events by default...
thinkpad_acpi: Standard ACPI backlight interface not available,
thinkpad_acpi native brightness control enabled
thinkpad_acpi: detected a 16-level brightness capable ThinkPad
Note that this is purely cosmetic, there is absolutely _no_ change in
behaviour. Those events are sometimes enabled at runtime by userspace, but
the driver never enables them by itself unless someone messed with the
default keymaps.
Signed-off-by: Henrique de Moraes Holschuh <hmh@hmh.eng.br>
Reported-by: Jochen Schulz <jrschulz@well-adjusted.de>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/platform/x86/thinkpad_acpi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c index 06c7c03c8f2f..5a22a064222c 100644 --- a/drivers/platform/x86/thinkpad_acpi.c +++ b/drivers/platform/x86/thinkpad_acpi.c @@ -2655,7 +2655,7 @@ static int __init hotkey_init(struct ibm_init_struct *iibm) /* update bright_acpimode... */ tpacpi_check_std_acpi_brightness_support(); - if (tp_features.bright_acpimode) { + if (tp_features.bright_acpimode && acpi_video_backlight_support()) { printk(TPACPI_INFO "This ThinkPad has standard ACPI backlight " "brightness control, supported by the ACPI " |