diff options
author | Michael Hennerich <michael.hennerich@analog.com> | 2009-04-16 08:38:34 -0400 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2009-06-12 06:03:48 -0400 |
commit | d4b890b0cd9e0ac75cbdf7011ef38ebc662930e6 (patch) | |
tree | 81171574c5008163e00f3813f182126b0094bc0a /arch/blackfin/kernel | |
parent | a413647bb5bbe5414cd68332ff77588db09d10be (diff) |
Blackfin: do not error if GPIO IRQ is requested already as GPIO
Some drivers expect to be able to request both as GPIO and GPIO IRQ, so
allow that use case.
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Signed-off-by: Bryan Wu <cooloney@kernel.org>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Diffstat (limited to 'arch/blackfin/kernel')
-rw-r--r-- | arch/blackfin/kernel/bfin_gpio.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/arch/blackfin/kernel/bfin_gpio.c b/arch/blackfin/kernel/bfin_gpio.c index a0678da40532..32289b302e79 100644 --- a/arch/blackfin/kernel/bfin_gpio.c +++ b/arch/blackfin/kernel/bfin_gpio.c | |||
@@ -1021,15 +1021,6 @@ int bfin_gpio_irq_request(unsigned gpio, const char *label) | |||
1021 | 1021 | ||
1022 | local_irq_save_hw(flags); | 1022 | local_irq_save_hw(flags); |
1023 | 1023 | ||
1024 | if (unlikely(reserved_gpio_irq_map[gpio_bank(gpio)] & gpio_bit(gpio))) { | ||
1025 | if (system_state == SYSTEM_BOOTING) | ||
1026 | dump_stack(); | ||
1027 | printk(KERN_ERR | ||
1028 | "bfin-gpio: GPIO %d is already reserved as gpio-irq !\n", | ||
1029 | gpio); | ||
1030 | local_irq_restore_hw(flags); | ||
1031 | return -EBUSY; | ||
1032 | } | ||
1033 | if (unlikely(reserved_peri_map[gpio_bank(gpio)] & gpio_bit(gpio))) { | 1024 | if (unlikely(reserved_peri_map[gpio_bank(gpio)] & gpio_bit(gpio))) { |
1034 | if (system_state == SYSTEM_BOOTING) | 1025 | if (system_state == SYSTEM_BOOTING) |
1035 | dump_stack(); | 1026 | dump_stack(); |