diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-01-15 12:39:04 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-01-15 12:39:04 +0000 |
| commit | 073154459b80a43f7e4f088b11c93c8e9cb07f14 (patch) | |
| tree | c81603910b742fbb0e4129034e5011364a9c7418 /arch/arm/common | |
| parent | c76d292db9869ae73fd401e9a3fc728ed5caf0a7 (diff) | |
| parent | ea0c4f3ca8a55e7e3138c2c4b3e9f7fe34d3ecab (diff) | |
Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel-stable
Diffstat (limited to 'arch/arm/common')
| -rw-r--r-- | arch/arm/common/sa1111.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/common/sa1111.c b/arch/arm/common/sa1111.c index d6c784e78c8..eb9796b0dab 100644 --- a/arch/arm/common/sa1111.c +++ b/arch/arm/common/sa1111.c @@ -279,7 +279,7 @@ static int sa1111_retrigger_lowirq(struct irq_data *d) for (i = 0; i < 8; i++) { sa1111_writel(ip0 ^ mask, mapbase + SA1111_INTPOL0); sa1111_writel(ip0, mapbase + SA1111_INTPOL0); - if (sa1111_readl(mapbase + SA1111_INTSTATCLR1) & mask) + if (sa1111_readl(mapbase + SA1111_INTSTATCLR0) & mask) break; } |