summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorAlex Frid <afrid@nvidia.com>2010-03-24 15:41:35 -0700
committerGary King <gking@nvidia.com>2010-04-08 20:07:35 -0700
commitefc2131a2dec09b77d451a6023dcd0bf4aa32cb3 (patch)
treed5eecd22823f95d5f83293815d34e1e12ac333fb /kernel
parent2104b580ccdf91c89d5880c9c50fd00fa16f2b66 (diff)
kernel: Mapped irq chip default_disable to chip->mask.
Despite the claim in struct irq_chip header: "disable: disable the interrupt (defaults to chip->mask if NULL)", it is not happening as default_disable is empty. Fixed it. Should also fix bug 667376. Change-Id: If0c39e3b4344701bbf235201c180d9c8ce56c489 Reviewed-on: http://git-master/r/947 Tested-by: Aleksandr Frid <afrid@nvidia.com> Reviewed-by: Gary King <gking@nvidia.com> Tested-by: Gary King <gking@nvidia.com>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/irq/chip.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/kernel/irq/chip.c b/kernel/irq/chip.c
index c1660194d115..c9ebfe3d9d08 100644
--- a/kernel/irq/chip.c
+++ b/kernel/irq/chip.c
@@ -266,6 +266,10 @@ static void default_enable(unsigned int irq)
*/
static void default_disable(unsigned int irq)
{
+ struct irq_desc *desc = irq_to_desc(irq);
+
+ desc->chip->mask(irq);
+ desc->status |= IRQ_MASKED;
}
/*