Commit cf8a1af8 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'acpi-video' 

* acpi-video:
  Revert "ACPI / video: Ignore BIOS initial backlight value for HP 250 G1"
  ACPI / video: Quirk initial backlight level 0
  ACPI / video: Fix initial level validity test
  ACPI / blacklist: fix name of ThinkPad Edge E530
parents 0faf996f 906f187b

drivers/acpi/blacklist.c

+1 −1
Original line number Diff line number Diff line
@@ -304,7 +304,7 @@ static struct dmi_system_id acpi_osi_dmi_table[] __initdata = { 
	},

	{

	.callback = dmi_disable_osi_win8,

	.ident = "Lenovo ThinkPad Edge E530",

	.ident = "ThinkPad Edge E530",

	.matches = {

		     DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),

		     DMI_MATCH(DMI_PRODUCT_VERSION, "3259A2G"),

drivers/acpi/video.c

+2 −10
Original line number Diff line number Diff line
@@ -504,14 +504,6 @@ static struct dmi_system_id video_dmi_table[] __initdata = { 
		DMI_MATCH(DMI_PRODUCT_NAME, "HP Pavilion m4 Notebook PC"),

		},

	},

	{

	 .callback = video_ignore_initial_backlight,

	 .ident = "HP 250 G1",

	 .matches = {

		DMI_MATCH(DMI_BOARD_VENDOR, "Hewlett-Packard"),

		DMI_MATCH(DMI_PRODUCT_NAME, "HP 250 G1 Notebook PC"),

		},

	},

	{}

};
@@ -856,9 +848,9 @@ acpi_video_init_brightness(struct acpi_video_device *device) 
		 * or an index). Set the backlight to max_level in this case.

		 */

		for (i = 2; i < br->count; i++)

			if (level_old == br->levels[i])

			if (level == br->levels[i])

				break;

		if (i == br->count)

		if (i == br->count || !level)

			level = max_level;

	}