diff options
| author | merge <null@invalid> | 2008-11-27 12:08:37 +0000 |
|---|---|---|
| committer | Andy Green <agreen@pads.home.warmcat.com> | 2008-11-27 12:08:37 +0000 |
| commit | d24f598760741b36f6a3b2f6ba3591b3b8685cf5 (patch) | |
| tree | 25de3c97a95b35c74570a1c65c884ddbb7a232c1 /arch/arm/plat-s3c64xx | |
| parent | a560d8579b4b009f847972667b7597c89030e26c (diff) | |
MERGE-via-balaji-tracking-hist-MERGE-via-stable-tracking-hist-fix-the-eint_unmask-logic-for
balaji-tracking-hist top was MERGE-via-stable-tracking-hist-fix-the-eint_unmask-logic-for / 3d7bd71b94568fd801e1d10f01ad3c2db16de027 ... parent commitmessage:
From: merge <null@invalid>
MERGE-via-stable-tracking-hist-fix-the-eint_unmask-logic-for-
stable-tracking-hist top was fix-the-eint_unmask-logic-for- / 840a005cbe74d680a0292a8e44f9ab1c2d279b6c ... parent commitmessage:
From: Matt Hsu <matt_hsu@openmoko.org>
fix the eint_unmask logic for s3c64xx
Diffstat (limited to 'arch/arm/plat-s3c64xx')
| -rw-r--r-- | arch/arm/plat-s3c64xx/irq-eint.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/plat-s3c64xx/irq-eint.c b/arch/arm/plat-s3c64xx/irq-eint.c index 8c01f9cd94b..24c5e899758 100644 --- a/arch/arm/plat-s3c64xx/irq-eint.c +++ b/arch/arm/plat-s3c64xx/irq-eint.c @@ -55,7 +55,7 @@ static void s3c_irq_eint_unmask(unsigned int irq) u32 mask; mask = __raw_readl(S3C64XX_EINT0MASK); - mask |= eint_irq_to_bit(irq); + mask &= ~eint_irq_to_bit(irq); __raw_writel(mask, S3C64XX_EINT0MASK); } |