Commit 56c67ce187a899f76c5f22dd30fd9cfc3d95a0c2

Authored by Linus Torvalds

Merge tag 'pm+acpi-3.18-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

Pull ACPI backlight fix from Rafael Wysocki:
 "This is a simple fix for an ACPI backlight regression introduced by a
  recent commit that overlooked a corner case which should have been
  taken into account"

* tag 'pm+acpi-3.18-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  ACPI / video: update condition to check if device is in _DOD list

Showing 1 changed file Side-by-side Diff

drivers/acpi/video.c
... ... @@ -1164,7 +1164,8 @@
1164 1164 return true;
1165 1165  
1166 1166 for (i = 0; i < video->attached_count; i++) {
1167   - if (video->attached_array[i].bind_info == device)
  1167 + if ((video->attached_array[i].value.int_val & 0xfff) ==
  1168 + (device->device_id & 0xfff))
1168 1169 return true;
1169 1170 }
1170 1171