From 460601548fdcfdd04d6e940cf8ad3448534c02c3 Mon Sep 17 00:00:00 2001 From: Mark Brown Date: Wed, 26 Oct 2011 09:51:55 +0200 Subject: [PATCH] --- yaml --- r: 279697 b: refs/heads/master c: d85b40948654dee3be1d8e43b0fce511c1b42d78 h: refs/heads/master i: 279695: 30c9c55f9d97e91813b192e76dfd14595c88c525 v: v3 --- [refs] | 2 +- trunk/arch/m68k/include/asm/gpio.h | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 09b82392d709..2e7b7c4e3961 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a2a3dfb8efc5d14cf39358ae0ec1da39667c2e6c +refs/heads/master: d85b40948654dee3be1d8e43b0fce511c1b42d78 diff --git a/trunk/arch/m68k/include/asm/gpio.h b/trunk/arch/m68k/include/asm/gpio.h index b2046839f4b2..00d0071de4c3 100644 --- a/trunk/arch/m68k/include/asm/gpio.h +++ b/trunk/arch/m68k/include/asm/gpio.h @@ -225,7 +225,8 @@ static inline void gpio_set_value(unsigned gpio, int value) static inline int gpio_to_irq(unsigned gpio) { - return (gpio < MCFGPIO_IRQ_MAX) ? gpio + MCFGPIO_IRQ_VECBASE : -EINVAL; + return (gpio < MCFGPIO_IRQ_MAX) ? gpio + MCFGPIO_IRQ_VECBASE + : __gpio_to_irq(gpio); } static inline int irq_to_gpio(unsigned irq)