diff --git a/arch/arm/src/imx6/imx_gpio.c b/arch/arm/src/imx6/imx_gpio.c
index b940712e8fa..d791579b17d 100644
--- a/arch/arm/src/imx6/imx_gpio.c
+++ b/arch/arm/src/imx6/imx_gpio.c
@@ -487,10 +487,10 @@ static inline int imx_gpio_configperiph(gpio_pinset_t pinset)
 
   /* Configure pin as a peripheral */
 
-  index = ((ioset & GPIO_PADMUX_MASK) >> GPIO_PADMUX_SHIFT);
+  index = ((pinset & GPIO_PADMUX_MASK) >> GPIO_PADMUX_SHIFT);
   regaddr = IMX_PADMUX_ADDRESS(index);
 
-  value = ((ioset & GPIO_ALT_MASK) >> GPIO_ALT_SHIFT);
+  value = ((pinset & GPIO_ALT_MASK) >> GPIO_ALT_SHIFT);
   regval = (value << PADMUX_MUXMODE_SHIFT);
 
   putreg32(regval, regaddr);