]> git.itanic.dy.fi Git - linux-stable/commitdiff
video: backlight: Drop maximum brightness override for brightness zero
authorMarek Vasut <marex@denx.de>
Tue, 21 Sep 2021 17:35:06 +0000 (19:35 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 18 Nov 2021 13:04:30 +0000 (14:04 +0100)
commit 33a5471f8da976bf271a1ebbd6b9d163cb0cb6aa upstream.

The note in c2adda27d202f ("video: backlight: Add of_find_backlight helper
in backlight.c") says that gpio-backlight uses brightness as power state.
This has been fixed since in ec665b756e6f7 ("backlight: gpio-backlight:
Correct initial power state handling") and other backlight drivers do not
require this workaround. Drop the workaround.

This fixes the case where e.g. pwm-backlight can perfectly well be set to
brightness 0 on boot in DT, which without this patch leads to the display
brightness to be max instead of off.

Fixes: c2adda27d202f ("video: backlight: Add of_find_backlight helper in backlight.c")
Cc: <stable@vger.kernel.org> # 5.4+
Cc: <stable@vger.kernel.org> # 4.19.x: ec665b756e6f7: backlight: gpio-backlight: Correct initial power state handling
Signed-off-by: Marek Vasut <marex@denx.de>
Acked-by: Noralf Trønnes <noralf@tronnes.org>
Reviewed-by: Daniel Thompson <daniel.thompson@linaro.org>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/video/backlight/backlight.c

index 537fe1b376ad73d3a304809a90ab835bd02fab4a..fc990e576340be6f36ccf4e63903b3ffc46db576 100644 (file)
@@ -688,12 +688,6 @@ static struct backlight_device *of_find_backlight(struct device *dev)
                        of_node_put(np);
                        if (!bd)
                                return ERR_PTR(-EPROBE_DEFER);
-                       /*
-                        * Note: gpio_backlight uses brightness as
-                        * power state during probe
-                        */
-                       if (!bd->props.brightness)
-                               bd->props.brightness = bd->props.max_brightness;
                }
        }