diff options
| author | Alex Frid <afrid@nvidia.com> | 2010-03-24 15:41:35 -0700 |
|---|---|---|
| committer | Gary King <gking@nvidia.com> | 2010-03-24 15:22:33 -0800 |
| commit | 21f99c1a2bbc26b57035a09f6bd02ed2737f47b3 (patch) | |
| tree | 67b4040647d03f225dfbf797cc1daa3ede409d29 /kernel | |
| parent | 9e85f24647a2d1f7074a3663c105254e32b6dba4 (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.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/kernel/irq/chip.c b/kernel/irq/chip.c index 7de11bd64dfe..2e0fed7e7cbf 100644 --- a/kernel/irq/chip.c +++ b/kernel/irq/chip.c @@ -234,6 +234,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; } /* |