Merge branch 'bugzilla-12249' into release (2d405707) · Commits · e / devices / android_kernel_teracube_2e

drivers/acpi/video.c

+22 −21

Original line number	Diff line number	Diff line
		@@ -809,12 +809,19 @@ acpi_video_init_brightness(struct acpi_video_device *device)
		br->flags._BCM_use_index = br->flags._BCL_use_index;

		/* _BQC uses INDEX while _BCL uses VALUE in some laptops */
		br->curr = max_level;
		br->curr = level_old = max_level;

		if (!device->cap._BQC)
		goto set_level;

		result = acpi_video_device_lcd_get_level_current(device, &level_old);
		if (result)
		goto out_free_levels;

		result = acpi_video_device_lcd_set_level(device, br->curr);
		/*
		* Set the level to maximum and check if _BQC uses indexed value
		*/
		result = acpi_video_device_lcd_set_level(device, max_level);
		if (result)
		goto out_free_levels;

		@@ -822,25 +829,19 @@ acpi_video_init_brightness(struct acpi_video_device *device)
		if (result)
		goto out_free_levels;

		if ((level != level_old) && !br->flags._BCM_use_index) {
		/* Note:
		* This piece of code does not work correctly if the current
		* brightness levels is 0.
		* But I guess boxes that boot with such a dark screen are rare
		* and no more code is needed to cover this specifial case.
		*/
		br->flags._BQC_use_index = (level == max_level ? 0 : 1);

		if (level_ac_battery != 2) {
		/*
		* For now, we don't support the _BCL like this:
		* 16, 15, 0, 1, 2, 3, ..., 14, 15, 16
		* because we may mess up the index returned by _BQC.
		* Plus: we have not got a box like this.
		*/
		ACPI_ERROR((AE_INFO, "_BCL not supported\n"));
		}
		br->flags._BQC_use_index = 1;
		}
		if (!br->flags._BQC_use_index)
		goto set_level;

		if (br->flags._BCL_reversed)
		level_old = (br->count - 1) - level_old;
		level_old = br->levels[level_old];

		set_level:
		result = acpi_video_device_lcd_set_level(device, level_old);
		if (result)
		goto out_free_levels;

		ACPI_DEBUG_PRINT((ACPI_DB_INFO,
		"found %d brightness levels\n", count - 2));