Merge remote-tracking branch 'pinctrl/for-next'

[deliverable/linux.git] / drivers / pinctrl / freescale / pinctrl-imx.c

diff --git a/drivers/pinctrl/freescale/pinctrl-imx.c b/drivers/pinctrl/freescale/pinctrl-imx.c
index 71391757938b79b85bf109e6dead4319384c0e7b..47613201269af42dd3fff670c92008333bf0adf0 100644 (file)
--- a/drivers/pinctrl/freescale/pinctrl-imx.c
+++ b/drivers/pinctrl/freescale/pinctrl-imx.c
@@ -315,7 +315,7 @@ static int imx_pmx_gpio_request_enable(struct pinctrl_dev *pctldev,
 
        /* Currently implementation only for shared mux/conf register */
        if (!(info->flags & SHARE_MUX_CONF_REG))
-               return -EINVAL;
+               return 0;
 
        pin_reg = &info->pin_regs[offset];
        if (pin_reg->mux_reg == -1)
@@ -380,7 +380,7 @@ static int imx_pmx_gpio_set_direction(struct pinctrl_dev *pctldev,
         * They are part of the shared mux/conf register.
         */
        if (!(info->flags & SHARE_MUX_CONF_REG))
-               return -EINVAL;
+               return 0;
 
        pin_reg = &info->pin_regs[offset];
        if (pin_reg->mux_reg == -1)
@@ -501,7 +501,7 @@ static void imx_pinconf_group_dbg_show(struct pinctrl_dev *pctldev,
                ret = imx_pinconf_get(pctldev, pin->pin, &config);
                if (ret)
                        return;
-               seq_printf(s, "%s: 0x%lx", name, config);
+               seq_printf(s, "  %s: 0x%lx\n", name, config);
        }
 }