1 files changed, 16 insertions, 2 deletions

diff --git a/drivers/pinctrl/stm32/pinctrl-stm32.c b/drivers/pinctrl/stm32/pinctrl-stm32.c
index eb6ae1462f4e..111225ec075c 100644
--- a/drivers/pinctrl/stm32/pinctrl-stm32.c
+++ b/drivers/pinctrl/stm32/pinctrl-stm32.c
@@ -639,6 +639,11 @@ static int stm32_pmx_set_mux(struct pinctrl_dev *pctldev,
         }
 
         range = pinctrl_find_gpio_range_from_pin(pctldev, g->pin);
+        if (!range) {
+                dev_err(pctl->dev, "No gpio range defined.\n");
+                return -EINVAL;
+        }
+
         bank = gpiochip_get_data(range->gc);
         pin = stm32_gpio_pin(g->pin);
 
@@ -807,11 +812,17 @@ static int stm32_pconf_parse_conf(struct pinctrl_dev *pctldev,
                 unsigned int pin, enum pin_config_param param,
                 enum pin_config_param arg)
 {
+        struct stm32_pinctrl *pctl = pinctrl_dev_get_drvdata(pctldev);
         struct pinctrl_gpio_range *range;
         struct stm32_gpio_bank *bank;
         int offset, ret = 0;
 
         range = pinctrl_find_gpio_range_from_pin(pctldev, pin);
+        if (!range) {
+                dev_err(pctl->dev, "No gpio range defined.\n");
+                return -EINVAL;
+        }
+
         bank = gpiochip_get_data(range->gc);
         offset = stm32_gpio_pin(pin);
 
@@ -893,6 +904,9 @@ static void stm32_pconf_dbg_show(struct pinctrl_dev *pctldev,
         bool val;
 
         range = pinctrl_find_gpio_range_from_pin_nolock(pctldev, pin);
+        if (!range)
+                return;
+
         bank = gpiochip_get_data(range->gc);
         offset = stm32_gpio_pin(pin);
 
@@ -1173,7 +1187,7 @@ int stm32_pctl_probe(struct platform_device *pdev)
                 return PTR_ERR(pctl->pctl_dev);
         }
 
-        for_each_child_of_node(np, child)
+        for_each_available_child_of_node(np, child)
                 if (of_property_read_bool(child, "gpio-controller"))
                         banks++;
 
@@ -1186,7 +1200,7 @@ int stm32_pctl_probe(struct platform_device *pdev)
         if (!pctl->banks)
                 return -ENOMEM;
 
-        for_each_child_of_node(np, child) {
+        for_each_available_child_of_node(np, child) {
                 if (of_property_read_bool(child, "gpio-controller")) {
                         ret = stm32_gpiolib_register_bank(pctl, child);
                         if (ret)