]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
backlight: pwm_bl: Don't use GPIOF_* with gpiod_get_direction
authorWolfram Sang <wsa+renesas@sang-engineering.com>
Sun, 14 Jan 2018 21:07:10 +0000 (22:07 +0100)
committerStefan Bader <stefan.bader@canonical.com>
Fri, 1 Mar 2019 13:20:49 +0000 (14:20 +0100)
BugLink: http://bugs.launchpad.net/bugs/1815234
[ Upstream commit bb084c0f61d659f0e6d371b096e0e57998f191d6 ]

The documentation was wrong, gpiod_get_direction() returns 0/1 instead
of the GPIOF_* flags. The docs were fixed with commit 94fc73094abe47
("gpio: correct docs about return value of gpiod_get_direction"). Now,
fix this user (until a better, system-wide solution is in place).

Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Acked-by: Daniel Thompson <daniel.thompson@linaro.org>
Reviewed-by: Simon Horman <horms+renesas@verge.net.au>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
drivers/video/backlight/pwm_bl.c

index 1c2289ddd555a64a418f29edeaf8e4b5643430b9..0fa7d2bd0e4811c6c404663451c67f6ecea6afee 100644 (file)
@@ -301,14 +301,14 @@ static int pwm_backlight_probe(struct platform_device *pdev)
 
        /*
         * If the GPIO is not known to be already configured as output, that
-        * is, if gpiod_get_direction returns either GPIOF_DIR_IN or -EINVAL,
-        * change the direction to output and set the GPIO as active.
+        * is, if gpiod_get_direction returns either 1 or -EINVAL, change the
+        * direction to output and set the GPIO as active.
         * Do not force the GPIO to active when it was already output as it
         * could cause backlight flickering or we would enable the backlight too
         * early. Leave the decision of the initial backlight state for later.
         */
        if (pb->enable_gpio &&
-           gpiod_get_direction(pb->enable_gpio) != GPIOF_DIR_OUT)
+           gpiod_get_direction(pb->enable_gpio) != 0)
                gpiod_direction_output(pb->enable_gpio, 1);
 
        pb->power_supply = devm_regulator_get(&pdev->dev, "power");