Merge tag 'v3.12-rc4' into devel

Linux 3.12-rc4

1 files changed, 3 insertions, 2 deletions

diff --git a/drivers/pinctrl/pinctrl-palmas.c b/drivers/pinctrl/pinctrl-palmas.c
index e4d61fa4212c..61643815e73e 100644
--- a/drivers/pinctrl/pinctrl-palmas.c
+++ b/drivers/pinctrl/pinctrl-palmas.c
@@ -891,9 +891,10 @@ static int palmas_pinconf_set(struct pinctrl_dev *pctldev,
                 param = pinconf_to_config_param(configs[i]);
                 param_val = pinconf_to_config_argument(configs[i]);
 
+                if (param == PIN_CONFIG_BIAS_PULL_PIN_DEFAULT)
+                        continue;
+
                 switch (param) {
-                case PIN_CONFIG_BIAS_PULL_PIN_DEFAULT:
-                        return 0;
                 case PIN_CONFIG_BIAS_DISABLE:
                 case PIN_CONFIG_BIAS_PULL_UP:
                 case PIN_CONFIG_BIAS_PULL_DOWN: