diff options
author | Dave Airlie <airlied@redhat.com> | 2014-09-16 11:28:52 +1000 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2014-09-16 11:38:04 +1000 |
commit | b2efb3f0a1db62aff5e824125785ec6731143b6d (patch) | |
tree | 67510cec69e18e55d82bed803428b2a5027d92bb /drivers/video/backlight/pwm_bl.c | |
parent | 4ac073640a528662a7c072a30e92e70ce00ded33 (diff) | |
parent | 9e82bf014195d6f0054982c463575cdce24292be (diff) | |
download | lwn-b2efb3f0a1db62aff5e824125785ec6731143b6d.tar.gz lwn-b2efb3f0a1db62aff5e824125785ec6731143b6d.zip |
drm: backmerge tag 'v3.17-rc5' into drm-next
This is requested to get the fixes for intel and radeon into the
same tree for future development work.
i915_display.c: fix missing dev_priv conflict.
Diffstat (limited to 'drivers/video/backlight/pwm_bl.c')
-rw-r--r-- | drivers/video/backlight/pwm_bl.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/video/backlight/pwm_bl.c b/drivers/video/backlight/pwm_bl.c index d7a3d13e72ec..b85983e97f0a 100644 --- a/drivers/video/backlight/pwm_bl.c +++ b/drivers/video/backlight/pwm_bl.c @@ -173,6 +173,7 @@ static int pwm_backlight_parse_dt(struct device *dev, data->max_brightness--; } + data->enable_gpio = -EINVAL; return 0; } |