Commit fa4007ca authored by Axel Lin's avatar Axel Lin Committed by Linus Walleij

gpio: mpc8xxx: Fixup setting gpio direction output

For devtype with specific gpio_dir_out implementation, current code is
wrong because below code sets both gc->direction_output and
mpc8xxx_gc->direction_output to the same function.

gc->direction_output = devtype->gpio_dir_out ?: gc->direction_output;
mpc8xxx_gc->direction_output = gc->direction_output;

Set mpc8xxx_gc->direction_output = gc->direction_output first to fix it.
This way mpc8xxx_gc->direction_output actually calls the standard
bgpio_dir_out() to update register.

Fixes: commit 42178e2a ("drivers/gpio: Switch gpio-mpc8xxx to use gpio-generic")
Signed-off-by: default avatarAxel Lin <axel.lin@ingics.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 28c5a41e
...@@ -334,6 +334,7 @@ static int mpc8xxx_probe(struct platform_device *pdev) ...@@ -334,6 +334,7 @@ static int mpc8xxx_probe(struct platform_device *pdev)
mpc8xxx_gc->read_reg = gc->read_reg; mpc8xxx_gc->read_reg = gc->read_reg;
mpc8xxx_gc->write_reg = gc->write_reg; mpc8xxx_gc->write_reg = gc->write_reg;
mpc8xxx_gc->direction_output = gc->direction_output;
if (!devtype) if (!devtype)
devtype = &mpc8xxx_gpio_devtype_default; devtype = &mpc8xxx_gpio_devtype_default;
...@@ -348,8 +349,6 @@ static int mpc8xxx_probe(struct platform_device *pdev) ...@@ -348,8 +349,6 @@ static int mpc8xxx_probe(struct platform_device *pdev)
gc->get = devtype->gpio_get ?: gc->get; gc->get = devtype->gpio_get ?: gc->get;
gc->to_irq = mpc8xxx_gpio_to_irq; gc->to_irq = mpc8xxx_gpio_to_irq;
mpc8xxx_gc->direction_output = gc->direction_output;
ret = gpiochip_add_data(gc, mpc8xxx_gc); ret = gpiochip_add_data(gc, mpc8xxx_gc);
if (ret) { if (ret) {
pr_err("%s: GPIO chip registration failed with status %d\n", pr_err("%s: GPIO chip registration failed with status %d\n",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment