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 | |
| parent | ea840aa2d01cf107b331d04ddea46efaee583a83 (diff) | |
| parent | 28c32e99bdf5ab838e7179c1aaca5a35a07f2a2b (diff) | |
| download | blackbird-op-linux-b943aa83f8038959999a6b12e469a875ab245a36.tar.gz blackbird-op-linux-b943aa83f8038959999a6b12e469a875ab245a36.zip | |
Merge branch 'bugzilla-13671' into release
| -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) unsigned long long level_current, level_next; int result = -EINVAL; + /* no warning message if acpi_backlight=vendor is used */ + if (!acpi_video_backlight_support()) + return 0; + if (!device->brightness) goto out; |
