From: Richard Genoud Date: Fri, 29 Mar 2013 09:03:26 +0000 (+0100) Subject: pinctrl: select_state: don't call pinctrl_free_setting on error X-Git-Tag: omap-for-v3.10/dt-fixes-for-merge-window~141^2~25 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=af6061777131639d7d2687ce542b6052a6510c25;p=pandora-kernel.git pinctrl: select_state: don't call pinctrl_free_setting on error As Stephen Warren pointed out, pinctrl_free_setting() was called instead of pinmux_disable_setting() on error. In this error code, we want to call pinmux_disable_setting() where pinmux_enable_setting() was called. And when pinconf_apply_setting() was called, we can't do much to undo the pin muxing (the closest thing I can think about for "unmuxing" a pin is muxing it as GPIO input). Signed-off-by: Richard Genoud Reviewed-by: Stephen Warren Signed-off-by: Linus Walleij --- Reading git-diff-tree failed