[PATCH] pinctrl: axp209: dereference pointer after it's been set

From: Quentin Schulz
Date: Wed Dec 13 2017 - 03:56:33 EST


The number of GPIOs is gotten from a field within the structure
referenced in the of_device.data but it was actually read before it was
retrieved, thus it was dereferencing a null pointer.

Set the number of GPIOs after retrieving of_device.data.

Fixes: e1190083b89b ("pinctrl: axp209: add support for AXP813 GPIOs")

Signed-off-by: Quentin Schulz <quentin.schulz@xxxxxxxxxxxxxxxxxx>
Reported-by: MylÃne Josserand <mylene.josserand@xxxxxxxxxxxxxxxxxx>
---
drivers/pinctrl/pinctrl-axp209.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/pinctrl/pinctrl-axp209.c b/drivers/pinctrl/pinctrl-axp209.c
index 22d3bb0bf927..510a2821e910 100644
--- a/drivers/pinctrl/pinctrl-axp209.c
+++ b/drivers/pinctrl/pinctrl-axp209.c
@@ -413,9 +413,11 @@ static int axp20x_pctl_probe(struct platform_device *pdev)
pctl->chip.set = axp20x_gpio_set;
pctl->chip.direction_input = axp20x_gpio_input;
pctl->chip.direction_output = axp20x_gpio_output;
- pctl->chip.ngpio = pctl->desc->npins;

pctl->desc = (struct axp20x_pctrl_desc *)of_device_get_match_data(dev);
+
+ pctl->chip.ngpio = pctl->desc->npins;
+
pctl->regmap = axp20x->regmap;
pctl->dev = &pdev->dev;

--
2.14.1