Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'backlight-for-v4.11' of git://git.linaro.org/people/daniel.thompson/linux
Pull backlight fix from Daniel Thompson:
"Normally pull requests for backlight come from Lee Jones (and will
continue to do so) but the bug fixed here is annoying for few people
so I'm providing a little holiday cover.
Fix a single bug in the PWM backlight driver and make it play nice
with a wider range of GPIO devices. This bug is a regression and was
independently discovered by Geert Uytterhoevan and Paul Kocialkowski
(and is tested by both)"
* tag 'backlight-for-v4.11' of git://git.linaro.org/people/daniel.thompson/linux:
backlight: pwm_bl: Fix GPIO out for unimplemented .get_direction()
+4
-3
+4
-3
drivers/video/backlight/pwm_bl.c
+4
-3
drivers/video/backlight/pwm_bl.c
···
297
297
}
298
298
299
299
/*
300
-
* If the GPIO is configured as input, change the direction to output
301
-
* and set the GPIO as active.
300
+
* If the GPIO is not known to be already configured as output, that
301
+
* is, if gpiod_get_direction returns either GPIOF_DIR_IN or -EINVAL,
302
+
* change the direction to output and set the GPIO as active.
302
303
* Do not force the GPIO to active when it was already output as it
303
304
* could cause backlight flickering or we would enable the backlight too
304
305
* early. Leave the decision of the initial backlight state for later.
305
306
*/
306
307
if (pb->enable_gpio &&
307
-
gpiod_get_direction(pb->enable_gpio) == GPIOF_DIR_IN)
308
+
gpiod_get_direction(pb->enable_gpio) != GPIOF_DIR_OUT)
308
309
gpiod_direction_output(pb->enable_gpio, 1);
309
310
310
311
pb->power_supply = devm_regulator_get(&pdev->dev, "power");