From 1af3fc3fe57f962efae594085f13cf95e35ac579 Mon Sep 17 00:00:00 2001 From: Michael Hennerich Date: Sat, 28 Mar 2009 21:18:45 +0800 Subject: [PATCH] --- yaml --- r: 137094 b: refs/heads/master c: e1312bfcc25f9301f997bf1ce84355a0f1167847 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/blackfin/include/asm/gpio.h | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index a6f14a8bb274..56395bf491b8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a66648756f97ea5150875b85a0177c33e41afc1d +refs/heads/master: e1312bfcc25f9301f997bf1ce84355a0f1167847 diff --git a/trunk/arch/blackfin/include/asm/gpio.h b/trunk/arch/blackfin/include/asm/gpio.h index d4a082ef75b4..3c99ddc8df16 100644 --- a/trunk/arch/blackfin/include/asm/gpio.h +++ b/trunk/arch/blackfin/include/asm/gpio.h @@ -303,7 +303,10 @@ static inline void gpio_set_value(unsigned gpio, int value) static inline int gpio_to_irq(unsigned gpio) { - return (gpio + GPIO_IRQ_BASE); + if (likely(gpio < MAX_BLACKFIN_GPIOS)) + return gpio + GPIO_IRQ_BASE; + + return -EINVAL; } static inline int irq_to_gpio(unsigned irq)