Merge tag 'sh-for-linus' of git://github.com/pmundt/linux-sh

9391734d · Linus Torvalds <[email protected]> · 2012-09-25 09:20:48 -07:00

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.

Commit: 9391734d7662019f52db42e6e2c434f81aa0d2a2
Parents: e108a3c3 · 16d74ebe

Merge commit. Changes below are compared with the first parent: e108a3c3.

Changes

1 files changed · +2 −0

File	Status	Add	Del	Content
drivers/sh/pfc/pinctrl.c	modified	+2	−0	View file

drivers/sh/pfc/pinctrl.c

View file

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);