From 8be71c261248e5418cffa4fb11cc0e55b0abad71 Mon Sep 17 00:00:00 2001 From: Ben Dooks Date: Mon, 18 May 2009 19:40:18 +0100 Subject: [PATCH] --- yaml --- r: 149281 b: refs/heads/master c: 373e9644c5f557bc8992036f9a9281e9d98aef40 h: refs/heads/master i: 149279: 8e0a5ea0482bb5a90a1ec758deb0245ccce5a824 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-s3c2400/gpio.c | 4 ++-- trunk/arch/arm/mach-s3c2410/gpio.c | 2 +- trunk/arch/arm/plat-s3c24xx/gpio.c | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 1bc629941f57..67ecbc2bb9c5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 070276d5d049f385763dee19112bea08f56c9a0d +refs/heads/master: 373e9644c5f557bc8992036f9a9281e9d98aef40 diff --git a/trunk/arch/arm/mach-s3c2400/gpio.c b/trunk/arch/arm/mach-s3c2400/gpio.c index 81ebe2f09901..6c68e78f3595 100644 --- a/trunk/arch/arm/mach-s3c2400/gpio.c +++ b/trunk/arch/arm/mach-s3c2400/gpio.c @@ -33,8 +33,8 @@ int s3c2400_gpio_getirq(unsigned int pin) { - if (pin < S3C2410_GPE(0) || pin > S3C2400_GPE7_EINT7) - return -1; /* not valid interrupts */ + if (pin < S3C2410_GPE(0) || pin > S3C2400_GPE(7)) + return -EINVAL; /* not valid interrupts */ return (pin - S3C2410_GPE(0)) + IRQ_EINT0; } diff --git a/trunk/arch/arm/mach-s3c2410/gpio.c b/trunk/arch/arm/mach-s3c2410/gpio.c index bf7fbfe7e4d8..7974afca297c 100644 --- a/trunk/arch/arm/mach-s3c2410/gpio.c +++ b/trunk/arch/arm/mach-s3c2410/gpio.c @@ -40,7 +40,7 @@ int s3c2410_gpio_irqfilter(unsigned int pin, unsigned int on, unsigned long val; if (pin < S3C2410_GPG(8) || pin > S3C2410_GPG(15)) - return -1; + return -EINVAL; config &= 0xff; diff --git a/trunk/arch/arm/plat-s3c24xx/gpio.c b/trunk/arch/arm/plat-s3c24xx/gpio.c index ae0b9d6f3fb8..95df059b5a1d 100644 --- a/trunk/arch/arm/plat-s3c24xx/gpio.c +++ b/trunk/arch/arm/plat-s3c24xx/gpio.c @@ -184,10 +184,10 @@ EXPORT_SYMBOL(s3c2410_modify_misccr); int s3c2410_gpio_getirq(unsigned int pin) { if (pin < S3C2410_GPF(0) || pin > S3C2410_GPG(15)) - return -1; /* not valid interrupts */ + return -EINVAL; /* not valid interrupts */ if (pin < S3C2410_GPG(0) && pin > S3C2410_GPF(7)) - return -1; /* not valid pin */ + return -EINVAL; /* not valid pin */ if (pin < S3C2410_GPF(4)) return (pin - S3C2410_GPF(0)) + IRQ_EINT0;