lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Blackfin arch: refine the gpio check

Browse Source 
refine the gpio check in peripheral_request() so that it only
checks pins that can be used as both GPIO and a peripheral

Signed-off-by: Mike Frysinger <vapier.adi@gmail.com>
Signed-off-by: Bryan Wu <cooloney@kernel.org>
This commit is contained in:
Mike Frysinger 2008-10-28 16:16:29 +08:00 committed by Bryan Wu
parent a2d03a1d8e
commit 6a87d29bc6
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
arch/blackfin/kernel/bfin_gpio.c
View File

@ -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",