diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
index 09a15f6..c67a01c 100644
--- a/drivers/acpi/video.c
+++ b/drivers/acpi/video.c
@@ -626,17 +626,25 @@ acpi_video_cmp_level(const void *a, const void *b)
 /*
  * Decides if _BQC/_BCQ for this system is usable
  *
- * We did this by setting the level to maximum first and then read out the
- * current brightness level, if the value does not match, find out if it is
- * using index. If not, clear the _BQC/_BCQ capability.
+ * We do this by changing the level first and then read out the current
+ * brightness level, if the value does not match, find out if it is using index.
+ * If not, clear the _BQC/_BCQ capability.
  */
 static int acpi_video_bqc_quirk(struct acpi_video_device *device, int max_level)
 {
 	struct acpi_video_device_brightness *br = device->brightness;
-	int result;
+	int result, test_level;
 	unsigned long long level;
 
-	result = acpi_video_device_lcd_set_level(device, max_level);
+	result = acpi_video_device_lcd_get_level_current(device, &level, true);
+	if (result)
+		return result;
+
+	level += bqc_offset_aml_bug_workaround;
+
+	test_level = level == max_level ? br->levels[2] : max_level;
+
+	result = acpi_video_device_lcd_set_level(device, test_level);
 	if (result)
 		return result;
 
@@ -646,12 +654,12 @@ static int acpi_video_bqc_quirk(struct acpi_video_device *device, int max_level)
 
 	level += bqc_offset_aml_bug_workaround;
 
-	if (level != max_level) {
+	if (level != test_level) {
 		/* buggy _BQC found, need to find out if it uses index */
 		if (level < br->count) {
 			if (br->flags._BCL_reversed)
 				level = br->count - 3 - level;
-			if (br->levels[level + 2] == max_level)
+			if (br->levels[level + 2] == test_level)
 				br->flags._BQC_use_index = 1;
 		}