diff options
| author | Len Brown | 2009-04-24 07:34:29 +0200 |
|---|---|---|
| committer | Len Brown | 2009-04-24 07:34:29 +0200 |
| commit | 60cd8adc6bfddd5139a4400ba5127863f0381dac (patch) | |
| tree | e16d78627f87377eb27952c7dd68fa68ede5105d /drivers/acpi | |
| parent | Linux 2.6.30-rc3 (diff) | |
| parent | ACPI video: fix an error when the brightness levels on AC and on Battery are ... (diff) | |
| download | kernel-qcow2-linux-60cd8adc6bfddd5139a4400ba5127863f0381dac.tar.gz kernel-qcow2-linux-60cd8adc6bfddd5139a4400ba5127863f0381dac.tar.xz kernel-qcow2-linux-60cd8adc6bfddd5139a4400ba5127863f0381dac.zip | |
Merge branch 'video-ac-dc' into release
Diffstat (limited to 'drivers/acpi')
| -rw-r--r-- | drivers/acpi/video.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c index cd4fb7543a90..21968ae6ed91 100644 --- a/drivers/acpi/video.c +++ b/drivers/acpi/video.c @@ -770,10 +770,12 @@ acpi_video_init_brightness(struct acpi_video_device *device) * In this case, the first two elements in _BCL packages * are also supported brightness levels that OS should take care of. */ - for (i = 2; i < count; i++) - if (br->levels[i] == br->levels[0] || - br->levels[i] == br->levels[1]) + for (i = 2; i < count; i++) { + if (br->levels[i] == br->levels[0]) level_ac_battery++; + if (br->levels[i] == br->levels[1]) + level_ac_battery++; + } if (level_ac_battery < 2) { level_ac_battery = 2 - level_ac_battery; |