diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2009-05-21 17:10:21 -0400 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2009-05-21 17:10:21 -0400 |
| commit | 99ae99533a059750c4b0f76295625b8ac5ea751a (patch) | |
| tree | 281129684e730ccd5b5b1e1fbbd9b83f3fa18986 /arch/arm/mach-s3c2410/gpio.c | |
| parent | bcb8a0d6f5e73c61a5290b4faaaa48dfa629e6b0 (diff) | |
| parent | 7a05a2cbd317cbd16e6d1689bb1e5e208eaaba6f (diff) | |
[ARM] S3C24XX: Merge devel-gpio
Merge branch 'devel-gpio' into for-rmk-devel
Diffstat (limited to 'arch/arm/mach-s3c2410/gpio.c')
| -rw-r--r-- | arch/arm/mach-s3c2410/gpio.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-s3c2410/gpio.c b/arch/arm/mach-s3c2410/gpio.c index 36a3132f39e7..7974afca297c 100644 --- a/arch/arm/mach-s3c2410/gpio.c +++ b/arch/arm/mach-s3c2410/gpio.c | |||
| @@ -39,12 +39,12 @@ int s3c2410_gpio_irqfilter(unsigned int pin, unsigned int on, | |||
| 39 | unsigned long flags; | 39 | unsigned long flags; |
| 40 | unsigned long val; | 40 | unsigned long val; |
| 41 | 41 | ||
| 42 | if (pin < S3C2410_GPG8 || pin > S3C2410_GPG15) | 42 | if (pin < S3C2410_GPG(8) || pin > S3C2410_GPG(15)) |
| 43 | return -1; | 43 | return -EINVAL; |
| 44 | 44 | ||
| 45 | config &= 0xff; | 45 | config &= 0xff; |
| 46 | 46 | ||
| 47 | pin -= S3C2410_GPG8; | 47 | pin -= S3C2410_GPG(8); |
| 48 | reg += pin & ~3; | 48 | reg += pin & ~3; |
| 49 | 49 | ||
| 50 | local_irq_save(flags); | 50 | local_irq_save(flags); |