summaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorlars <lars@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-03-08 20:34:40 +0000
committerlars <lars@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-03-08 20:34:40 +0000
commitc60251a7a0c76c871bfbf1e062e44b1c6cf840af (patch)
treed68cd443d71c1ae10ad60bf7f99e973a306d6d5b /target/linux
parent114dc323efd1ade4c42c019acd438303bd50c00c (diff)
[xburst] jz4740-gpio: Fix potential race condition
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20071 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/xburst/files-2.6.32/arch/mips/jz4740/gpio.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/target/linux/xburst/files-2.6.32/arch/mips/jz4740/gpio.c b/target/linux/xburst/files-2.6.32/arch/mips/jz4740/gpio.c
index df5df5cd0..8a99f4d37 100644
--- a/target/linux/xburst/files-2.6.32/arch/mips/jz4740/gpio.c
+++ b/target/linux/xburst/files-2.6.32/arch/mips/jz4740/gpio.c
@@ -312,8 +312,8 @@ static unsigned int jz_gpio_irq_startup(unsigned int irq)
jz_gpio_set_irq_bit(irq, JZ_REG_GPIO_SELECT_SET);
- jz_gpio_irq_unmask(irq);
desc->status &= ~IRQ_MASKED;
+ jz_gpio_irq_unmask(irq);
return 0;
}