pinctrl: tegra: fix pinconfig_group_set

[sojka/nv-tegra/linux-3.10.git] / drivers / pinctrl / pinctrl-tegra.c

diff --git a/drivers/pinctrl/pinctrl-tegra.c b/drivers/pinctrl/pinctrl-tegra.c
index 5f3a11016d85e1c462d9f4bf1878155ef74db097..04132e0265487d66c1d131f2f06cbf28cc0a983f 100644 (file)
--- a/drivers/pinctrl/pinctrl-tegra.c
+++ b/drivers/pinctrl/pinctrl-tegra.c
@@ -373,13 +373,13 @@ static int tegra_pinctrl_get_func_groups(struct pinctrl_dev *pctldev,
        return 0;
 }
 
-static int tegra_pinconfig_froup_set(struct pinctrl_dev *pctldev,
+static int tegra_pinconfig_group_set(struct pinctrl_dev *pctldev,
                unsigned group, unsigned long param, unsigned long arg)
 {
        unsigned long config;
        int ret;
 
-       config = TEGRA_PINCONF_PACK(TEGRA_PINCONF_PARAM_TRISTATE, arg);
+       config = TEGRA_PINCONF_PACK(param, arg);
        ret = tegra_pinconf_group_set(pctldev, group, config);
        if (ret < 0)
                dev_err(pctldev->dev,
@@ -495,10 +495,10 @@ static int tegra_pinctrl_gpio_set_direction(struct pinctrl_dev *pctldev,
         * tristate = 0 for output direction.
         */
        if (input)
-               ret = tegra_pinconfig_froup_set(pctldev, group,
+               ret = tegra_pinconfig_group_set(pctldev, group,
                                        TEGRA_PINCONF_PARAM_ENABLE_INPUT, 1);
        else
-               ret = tegra_pinconfig_froup_set(pctldev, group,
+               ret = tegra_pinconfig_group_set(pctldev, group,
                                        TEGRA_PINCONF_PARAM_TRISTATE, 0);
        return ret;
 }