diff options
| author |   Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-06-22 14:31:57 +0100 |
|---|---|---|
| committer |   Russell King <rmk+kernel@arm.linux.org.uk> | 2009-06-22 14:31:57 +0100 |
| commit | 915166d96f5cab90b6f39f37da1139e5eab516b2 (patch) | |
| tree | d5746250f994bad7c32c2853e1cc89c9181e1c88 /arch/arm/plat-s3c | |
| parent | [ARM] Update mach-types (diff) | |
| parent | [ARM] S3C: Fix gpio-config off-by-one bug (diff) | |
| download | linux-dev-915166d96f5cab90b6f39f37da1139e5eab516b2.tar.xz linux-dev-915166d96f5cab90b6f39f37da1139e5eab516b2.zip | |
Merge branch 'next-s3c' of git://aeryn.fluff.org.uk/bjdooks/linux into devel
Diffstat (limited to 'arch/arm/plat-s3c')
| -rw-r--r-- | arch/arm/plat-s3c/gpio-config.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/plat-s3c/gpio-config.c b/arch/arm/plat-s3c/gpio-config.c index 08044dec9731..456969b6fa0d 100644 --- a/arch/arm/plat-s3c/gpio-config.c +++ b/arch/arm/plat-s3c/gpio-config.c @@ -119,7 +119,7 @@ int s3c_gpio_setcfg_s3c64xx_4bit(struct s3c_gpio_chip *chip, unsigned int shift = (off & 7) * 4; u32 con; - if (off < 8 && chip->chip.ngpio >= 8) + if (off < 8 && chip->chip.ngpio > 8) reg -= 4; if (s3c_gpio_is_cfg_special(cfg)) { |