OSDN Git Service
(root)
/
tomoyo
/
tomoyo-test1.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b470cef
)
gpio: stmpe: Move chip registration
author
Linus Walleij
<linus.walleij@linaro.org>
Tue, 28 Jul 2020 07:27:06 +0000
(09:27 +0200)
committer
Linus Walleij
<linus.walleij@linaro.org>
Mon, 3 Aug 2020 23:07:23 +0000
(
01:07
+0200)
Make sure to register the GPIO chip after requesting the
interrupt and setting up the IRQ members of the irqchip.
Fixes:
9745079609df
("gpio: stmpe: Use irqchip template")
Reported-by: Serge Semin <fancer.lancer@gmail.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Cc: Patrice Chotard <patrice.chotard@st.com>
Link:
https://lore.kernel.org/r/20200728072706.348725-1-linus.walleij@linaro.org
drivers/gpio/gpio-stmpe.c
patch
|
blob
|
history
diff --git
a/drivers/gpio/gpio-stmpe.c
b/drivers/gpio/gpio-stmpe.c
index
395ee51
..
6c48809
100644
(file)
--- a/
drivers/gpio/gpio-stmpe.c
+++ b/
drivers/gpio/gpio-stmpe.c
@@
-500,12
+500,6
@@
static int stmpe_gpio_probe(struct platform_device *pdev)
if (ret)
goto out_free;
- ret = gpiochip_add_data(&stmpe_gpio->chip, stmpe_gpio);
- if (ret) {
- dev_err(&pdev->dev, "unable to add gpiochip: %d\n", ret);
- goto out_disable;
- }
-
if (irq > 0) {
struct gpio_irq_chip *girq;
@@
-528,6
+522,12
@@
static int stmpe_gpio_probe(struct platform_device *pdev)
girq->threaded = true;
}
+ ret = gpiochip_add_data(&stmpe_gpio->chip, stmpe_gpio);
+ if (ret) {
+ dev_err(&pdev->dev, "unable to add gpiochip: %d\n", ret);
+ goto out_disable;
+ }
+
platform_set_drvdata(pdev, stmpe_gpio);
return 0;