diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-11-28 06:49:56 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-11-28 06:49:56 -0500 |
| commit | 9ee4be4156b1a507f199e750ba2c13ffb6ea9b42 (patch) | |
| tree | c92cb39ad1f0be559390c2a995d9aad2b0300b14 /drivers/gpu/drm/i915/intel_panel.c | |
| parent | 005d610f2abc550172726b997f5cfe683769cc1c (diff) | |
| parent | d4d6373c1109b11c8118340be97ae31b8f94d66a (diff) | |
Merge remote-tracking branch 'regulator/for-linus' into regulator-next
Diffstat (limited to 'drivers/gpu/drm/i915/intel_panel.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_panel.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_panel.c b/drivers/gpu/drm/i915/intel_panel.c index 499d4c0dbeeb..21f60b7d69a3 100644 --- a/drivers/gpu/drm/i915/intel_panel.c +++ b/drivers/gpu/drm/i915/intel_panel.c | |||
| @@ -326,7 +326,8 @@ static int intel_panel_update_status(struct backlight_device *bd) | |||
| 326 | static int intel_panel_get_brightness(struct backlight_device *bd) | 326 | static int intel_panel_get_brightness(struct backlight_device *bd) |
| 327 | { | 327 | { |
| 328 | struct drm_device *dev = bl_get_data(bd); | 328 | struct drm_device *dev = bl_get_data(bd); |
| 329 | return intel_panel_get_backlight(dev); | 329 | struct drm_i915_private *dev_priv = dev->dev_private; |
| 330 | return dev_priv->backlight_level; | ||
| 330 | } | 331 | } |
| 331 | 332 | ||
| 332 | static const struct backlight_ops intel_panel_bl_ops = { | 333 | static const struct backlight_ops intel_panel_bl_ops = { |