diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-02-04 01:58:29 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-02-04 01:58:29 -0500 |
| commit | 8f4bf4bcc4d6f70a47baec5d73bd411e572842e0 (patch) | |
| tree | 8ed86ebd19c32a629bfcfb43378bf32acd14c7d6 /drivers/gpu/drm/i915/intel_panel.c | |
| parent | 1ed39bac21c3c2934b18de34df9478ad7b8edf1f (diff) | |
| parent | e36f014edff70fc02b3d3d79cead1d58f289332e (diff) | |
Merge tag 'v3.19-rc7' into perf/core, to merge fixes before applying new changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_panel.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_panel.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_panel.c b/drivers/gpu/drm/i915/intel_panel.c index 4d63839bd9b4..dfb783a8f2c3 100644 --- a/drivers/gpu/drm/i915/intel_panel.c +++ b/drivers/gpu/drm/i915/intel_panel.c | |||
| @@ -962,7 +962,7 @@ void intel_panel_enable_backlight(struct intel_connector *connector) | |||
| 962 | 962 | ||
| 963 | WARN_ON(panel->backlight.max == 0); | 963 | WARN_ON(panel->backlight.max == 0); |
| 964 | 964 | ||
| 965 | if (panel->backlight.level == 0) { | 965 | if (panel->backlight.level <= panel->backlight.min) { |
| 966 | panel->backlight.level = panel->backlight.max; | 966 | panel->backlight.level = panel->backlight.max; |
| 967 | if (panel->backlight.device) | 967 | if (panel->backlight.device) |
| 968 | panel->backlight.device->props.brightness = | 968 | panel->backlight.device->props.brightness = |