diff --git a/drivers/pinctrl/core.c b/drivers/pinctrl/core.c
index f04f7d3d9a94..96cee791aa82 100644
--- a/drivers/pinctrl/core.c
+++ b/drivers/pinctrl/core.c
@@ -991,6 +991,8 @@ static int pinctrl_select_state_locked(struct pinctrl *p,
 				pinmux_enable_setting(setting);
 		}
 	}
+
+	p->state = old_state;
 	return ret;
 }