summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-09-25 09:20:48 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-09-25 09:20:48 -0700
commit9391734d7662019f52db42e6e2c434f81aa0d2a2 (patch)
tree536d5525ec208c0a6370d318b17da31f2a7b6497
parente108a3c3268d4539e4ae538aa41bca1afb15dc3e (diff)
parent16d74ebeb1b056dfc80e69b44cc3a26515db1925 (diff)
downloadop-kernel-dev-9391734d7662019f52db42e6e2c434f81aa0d2a2.zip
op-kernel-dev-9391734d7662019f52db42e6e2c434f81aa0d2a2.tar.gz
Merge tag 'sh-for-linus' of git://github.com/pmundt/linux-sh
Pull SuperH fix from Paul Mundt: "One last minute regression fix.." * tag 'sh-for-linus' of git://github.com/pmundt/linux-sh: sh: pfc: Fix up GPIO mux type reconfig case.
-rw-r--r--drivers/sh/pfc/pinctrl.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/sh/pfc/pinctrl.c b/drivers/sh/pfc/pinctrl.c
index a3ac39b..0646bf6 100644
--- a/drivers/sh/pfc/pinctrl.c
+++ b/drivers/sh/pfc/pinctrl.c
@@ -208,6 +208,8 @@ static int sh_pfc_gpio_request_enable(struct pinctrl_dev *pctldev,
break;
case PINMUX_TYPE_GPIO:
+ case PINMUX_TYPE_INPUT:
+ case PINMUX_TYPE_OUTPUT:
break;
default:
pr_err("Unsupported mux type (%d), bailing...\n", pinmux_type);
OpenPOWER on IntegriCloud