diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-08-12 13:22:49 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-08-12 13:22:49 -0400 |
| commit | fbf8d7106c926d375c76e65cc878f4fa7b91cbc3 (patch) | |
| tree | e9faf7f8a9ce8da9ad2e2a3f1768a4af414670d4 /drivers/acpi/video.c | |
| parent | 98f62b7a082e1e9eb762c7329a704316f6e07698 (diff) | |
| parent | d4e4ab86bcba5a72779c43dc1459f71fea3d89c8 (diff) | |
Merge 3.11-rc5 into staging-next
We want the staging fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/acpi/video.c')
| -rw-r--r-- | drivers/acpi/video.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c index 0ec434d2586d..e1284b8dc6ee 100644 --- a/drivers/acpi/video.c +++ b/drivers/acpi/video.c | |||
| @@ -689,7 +689,7 @@ static int acpi_video_bqc_quirk(struct acpi_video_device *device, | |||
| 689 | * Some systems always report current brightness level as maximum | 689 | * Some systems always report current brightness level as maximum |
| 690 | * through _BQC, we need to test another value for them. | 690 | * through _BQC, we need to test another value for them. |
| 691 | */ | 691 | */ |
| 692 | test_level = current_level == max_level ? br->levels[2] : max_level; | 692 | test_level = current_level == max_level ? br->levels[3] : max_level; |
| 693 | 693 | ||
| 694 | result = acpi_video_device_lcd_set_level(device, test_level); | 694 | result = acpi_video_device_lcd_set_level(device, test_level); |
| 695 | if (result) | 695 | if (result) |