From f713a74cd0db65c0d9fae7268f9d7da0785dd329 Mon Sep 17 00:00:00 2001 From: David Vrabel Date: Mon, 26 Sep 2005 19:52:56 +0100 Subject: [PATCH] --- yaml --- r: 9319 b: refs/heads/master c: 6132f9e146150473f803323dc8064a5506e33952 h: refs/heads/master i: 9317: f06b536acc643f8e9eab76b38ddd03fb0d1774bf 9315: 85c6a2740cd59db945f48dbfe6c46b1d644e93f2 9311: edf2b39c0f19d229f6cbd7ce090e592082be7fb8 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-ixp4xx/common.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index c4f7387bcb85..854f15dcb9fa 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cbf8fd9f5aa5164e05cb04d4a34fcbe82f60beeb +refs/heads/master: 6132f9e146150473f803323dc8064a5506e33952 diff --git a/trunk/arch/arm/mach-ixp4xx/common.c b/trunk/arch/arm/mach-ixp4xx/common.c index 52ad11328e96..36b6045213ee 100644 --- a/trunk/arch/arm/mach-ixp4xx/common.c +++ b/trunk/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)