---

yaml
---
r: 127002
b: refs/heads/master
c: 6a87d29
h: refs/heads/master
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a2d03a1d8e2562cc64a223485c06db9840ac3b2b
+refs/heads/master: 6a87d29bc684d845fe8338a8ce279f743d343250

trunk/arch/blackfin/kernel/bfin_gpio.c

@@ -881,13 +881,13 @@ int peripheral_request(unsigned short per, const char *label)
 	if (!(per & P_DEFINED))
 		return -ENODEV;
 
-	if (check_gpio(ident))
-		return -EINVAL;
-
 	local_irq_save(flags);
 
-	/* Can't do GPIO and peripheral at the same time */
-	if (unlikely(reserved_gpio_map[gpio_bank(ident)] & gpio_bit(ident))) {
+	/* If a pin can be muxed as either GPIO or peripheral, make
+	 * sure it is not already a GPIO pin when we request it.
+	 */
+	if (unlikely(!check_gpio(ident) &&
+	    reserved_gpio_map[gpio_bank(ident)] & gpio_bit(ident))) {
 		dump_stack();
 		printk(KERN_ERR
 		       "%s: Peripheral %d is already reserved as GPIO by %s !\n",