summaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
authorDavid Vrabel <dvrabel@arcom.com>2005-09-26 19:52:56 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2005-09-26 19:52:56 +0100
commit6132f9e146150473f803323dc8064a5506e33952 (patch)
tree81bb5bd0c434d09b2523c5f280d377863a1c9205 /arch/arm
parentcbf8fd9f5aa5164e05cb04d4a34fcbe82f60beeb (diff)
downloadlinux-3.10-6132f9e146150473f803323dc8064a5506e33952.tar.gz
linux-3.10-6132f9e146150473f803323dc8064a5506e33952.tar.bz2
linux-3.10-6132f9e146150473f803323dc8064a5506e33952.zip
[ARM] 2935/1: ixp4xx: fix warnings in ixp4xx_set_irq_type
Patch from David Vrabel Signed-off-by: David Vrabel <dvrabel@arcom.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-ixp4xx/common.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm/mach-ixp4xx/common.c b/arch/arm/mach-ixp4xx/common.c
index 52ad11328e9..36b6045213e 100644
--- a/arch/arm/mach-ixp4xx/common.c
+++ b/arch/arm/mach-ixp4xx/common.c
@@ -125,7 +125,8 @@ static int ixp4xx_set_irq_type(unsigned int irq, unsigned int type)
} else if (type & IRQT_LOW) {
int_style = IXP4XX_GPIO_STYLE_ACTIVE_LOW;
irq_type = IXP4XX_IRQ_LEVEL;
- }
+ } else
+ return -EINVAL;
ixp4xx_config_irq(irq, irq_type);
@@ -142,6 +143,8 @@ static int ixp4xx_set_irq_type(unsigned int irq, unsigned int type)
/* Set the new style */
*int_reg |= (int_style << (line * IXP4XX_GPIO_STYLE_SIZE));
+
+ return 0;
}
static void ixp4xx_irq_mask(unsigned int irq)