1 files changed, 5 insertions, 5 deletions

diff --git a/drivers/pinctrl/pinmux.c b/drivers/pinctrl/pinmux.c
index 88cc5095d0c9..5f5158856ea9 100644
--- a/drivers/pinctrl/pinmux.c
+++ b/drivers/pinctrl/pinmux.c
@@ -482,13 +482,13 @@ void pinmux_disable_setting(struct pinctrl_setting const *setting)
                                  pins[i]);
                         continue;
                 }
-                desc->mux_setting = NULL;
+                if (desc->mux_setting == &(setting->data.mux)) {
+                        desc->mux_setting = NULL;
+                        /* And release the pin */
+                        pin_free(pctldev, pins[i], NULL);
+                }
         }
 
-        /* And release the pins */
-        for (i = 0; i < num_pins; i++)
-                pin_free(pctldev, pins[i], NULL);
-
         if (ops->disable)
                 ops->disable(pctldev, setting->data.mux.func, setting->data.mux.group);
 }