diff options
author | Graf Yang <graf.yang@analog.com> | 2008-11-18 04:48:22 -0500 |
---|---|---|
committer | Bryan Wu <cooloney@kernel.org> | 2008-11-18 04:48:22 -0500 |
commit | 8eb3e3bfd5544c4549a52e3cfc3df2be0b224dbd (patch) | |
tree | e84d647b8d29fe6cf9fdc22e6ab1fe877164067a /arch/blackfin/kernel/bfin_gpio.c | |
parent | 30af6d490427b49af5beca5824e22b00e468c951 (diff) |
Blackfin arch: Request the gpio resource when making it as an irq pin, avoiding override it.
Signed-off-by: Graf Yang <graf.yang@analog.com>
Signed-off-by: Bryan Wu <cooloney@kernel.org>
Diffstat (limited to 'arch/blackfin/kernel/bfin_gpio.c')
-rw-r--r-- | arch/blackfin/kernel/bfin_gpio.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/blackfin/kernel/bfin_gpio.c b/arch/blackfin/kernel/bfin_gpio.c index f8d666e6741b..de235b8f37a8 100644 --- a/arch/blackfin/kernel/bfin_gpio.c +++ b/arch/blackfin/kernel/bfin_gpio.c | |||
@@ -1257,10 +1257,10 @@ static int gpio_proc_read(char *buf, char **start, off_t offset, | |||
1257 | 1257 | ||
1258 | for (c = 0; c < MAX_RESOURCES; c++) { | 1258 | for (c = 0; c < MAX_RESOURCES; c++) { |
1259 | if (!check_gpio(c) && (reserved_gpio_map[gpio_bank(c)] & gpio_bit(c))) | 1259 | if (!check_gpio(c) && (reserved_gpio_map[gpio_bank(c)] & gpio_bit(c))) |
1260 | len = sprintf(buf, "GPIO_%d: %s \t\tGPIO %s\n", c, | 1260 | len = sprintf(buf, "GPIO_%d: \t%s \t\tGPIO %s\n", c, |
1261 | get_label(c), get_gpio_dir(c) ? "OUTPUT" : "INPUT"); | 1261 | get_label(c), get_gpio_dir(c) ? "OUTPUT" : "INPUT"); |
1262 | else if (reserved_peri_map[gpio_bank(c)] & gpio_bit(c)) | 1262 | else if (reserved_peri_map[gpio_bank(c)] & gpio_bit(c)) |
1263 | len = sprintf(buf, "GPIO_%d: %s \t\tPeripheral\n", c, get_label(c)); | 1263 | len = sprintf(buf, "GPIO_%d: \t%s \t\tPeripheral\n", c, get_label(c)); |
1264 | else | 1264 | else |
1265 | continue; | 1265 | continue; |
1266 | buf += len; | 1266 | buf += len; |