---

yaml --- r: 372526 b: refs/heads/master c: 24d6b36 h: refs/heads/master v: v3
git-mirror · Mar 15, 2013 · 109cd69 · 109cd69
1 parent 7281f20
commit 109cd69
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2119f7c9afaf4c5fe88e9ffec1f34c5bc6b02f78
+refs/heads/master: 24d6b36e91b0503cd1c88b34fa793c0c65fa767d
diff --git a/trunk/drivers/pinctrl/sh-pfc/gpio.c b/trunk/drivers/pinctrl/sh-pfc/gpio.c
@@ -71,16 +71,13 @@ static void sh_gpio_free(struct gpio_chip *gc, unsigned offset)
 {
 	struct sh_pfc *pfc = gpio_to_pfc(gc);
 	unsigned long flags;
-	int pinmux_type;
 
 	if (offset < pfc->info->nr_pins)
 		return pinctrl_free_gpio(offset);
 
 	spin_lock_irqsave(&pfc->lock, flags);
 
-	pinmux_type = pfc->info->gpios[offset].flags & PINMUX_FLAG_TYPE;
-
-	sh_pfc_config_gpio(pfc, offset, pinmux_type, GPIO_CFG_FREE);
+	sh_pfc_config_gpio(pfc, offset, PINMUX_TYPE_FUNCTION, GPIO_CFG_FREE);
 
 	spin_unlock_irqrestore(&pfc->lock, flags);
 }