From a049815229b6fcf0dd927630cbf5c127f5fb2a82 Mon Sep 17 00:00:00 2001 From: Quentin Schulz Date: Wed, 13 Dec 2017 09:55:03 +0100 Subject: [PATCH] pinctrl: axp209: dereference pointer after it's been set MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 Reported-by: Mylène Josserand Tested-by: Mylène Josserand Acked-by: Chen-Yu Tsai Signed-off-by: Linus Walleij --- 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 22d3bb0..510a282 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.7.4