From d24f598760741b36f6a3b2f6ba3591b3b8685cf5 Mon Sep 17 00:00:00 2001 From: merge Date: Thu, 27 Nov 2008 12:08:37 +0000 Subject: 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 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 fix the eint_unmask logic for s3c64xx --- arch/arm/plat-s3c64xx/irq-eint.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'arch/arm/plat-s3c64xx') 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); } -- cgit v1.2.3