aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2009-04-24 01:34:29 -0400
committerLen Brown <len.brown@intel.com>2009-04-24 01:34:29 -0400
commit60cd8adc6bfddd5139a4400ba5127863f0381dac (patch)
treee16d78627f87377eb27952c7dd68fa68ede5105d
parent091069740304c979f957ceacec39c461d0192158 (diff)
parent90af2cf6205bfc8def8c5a64c9134031d60b10fb (diff)
Merge branch 'video-ac-dc' into release
-rw-r--r--drivers/acpi/video.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
index cd4fb7543a9..21968ae6ed9 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;