diff options
| author | Len Brown <len.brown@intel.com> | 2009-12-30 02:51:31 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-12-30 02:51:31 -0500 |
| commit | b943aa83f8038959999a6b12e469a875ab245a36 (patch) | |
| tree | 495ae9fa79fb73b0e8674eabf17a87b1a265910d /drivers | |
| parent | ea840aa2d01cf107b331d04ddea46efaee583a83 (diff) | |
| parent | 28c32e99bdf5ab838e7179c1aaca5a35a07f2a2b (diff) | |
Merge branch 'bugzilla-13671' into release
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/acpi/video.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c index 05dff631591c..3b063a6ac52e 100644 --- a/drivers/acpi/video.c +++ b/drivers/acpi/video.c | |||
| @@ -1979,6 +1979,10 @@ acpi_video_switch_brightness(struct acpi_video_device *device, int event) | |||
| 1979 | unsigned long long level_current, level_next; | 1979 | unsigned long long level_current, level_next; |
| 1980 | int result = -EINVAL; | 1980 | int result = -EINVAL; |
| 1981 | 1981 | ||
| 1982 | /* no warning message if acpi_backlight=vendor is used */ | ||
| 1983 | if (!acpi_video_backlight_support()) | ||
| 1984 | return 0; | ||
| 1985 | |||
| 1982 | if (!device->brightness) | 1986 | if (!device->brightness) |
| 1983 | goto out; | 1987 | goto out; |
| 1984 | 1988 | ||