diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-27 10:50:54 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-27 10:50:54 +0100 |
| commit | 4944dd62de21230af039eda7cd218e9a09021d11 (patch) | |
| tree | bac70f7bab8506c7e1b0408bacbdb0b1d77262e9 /arch/sh/kernel/gpio.c | |
| parent | f17845e5d97ead8fbdadfd40039e058ec7cf4a42 (diff) | |
| parent | 0173a3265b228da319ceb9c1ec6a5682fd1b2d92 (diff) | |
| download | op-kernel-dev-4944dd62de21230af039eda7cd218e9a09021d11.zip op-kernel-dev-4944dd62de21230af039eda7cd218e9a09021d11.tar.gz | |
Merge commit 'v2.6.28-rc2' into tracing/urgent
Diffstat (limited to 'arch/sh/kernel/gpio.c')
| -rw-r--r-- | arch/sh/kernel/gpio.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/arch/sh/kernel/gpio.c b/arch/sh/kernel/gpio.c index bb8b812..d371653 100644 --- a/arch/sh/kernel/gpio.c +++ b/arch/sh/kernel/gpio.c @@ -267,9 +267,13 @@ int pinmux_config_gpio(struct pinmux_info *gpioc, unsigned gpio, break; in_range = enum_in_range(enum_id, &gpioc->function); - if (!in_range && range) + if (!in_range && range) { in_range = enum_in_range(enum_id, range); + if (in_range && enum_id == range->force) + continue; + } + if (!in_range) continue; @@ -432,7 +436,7 @@ static int __gpio_get_set_value(struct pinmux_info *gpioc, BUG(); else value = read_write_reg(dr->reg, dr->reg_width, - 1, bit, value, do_write); + 1, bit, !!value, do_write); return value; } |
