Commit 56c67ce1 authored Dec 04, 2014 by Linus Torvalds

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

parents ebea76f5 35d0565b

drivers/acpi/video.c

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1164,7 +1164,8 @@ static bool acpi_video_device_in_dod(struct acpi_video_device *device)
	return true;		return true;

	for (i = 0; i < video->attached_count; i++) {		for (i = 0; i < video->attached_count; i++) {
	if (video->attached_array[i].bind_info == device)		if ((video->attached_array[i].value.int_val & 0xfff) ==
			(device->device_id & 0xfff))
	return true;		return true;
	}		}