diff options
| author | LEROY Christophe <christophe.leroy@c-s.fr> | 2013-04-18 07:26:11 +0200 |
|---|---|---|
| committer | Scott Wood <scottwood@freescale.com> | 2013-07-02 01:38:32 +0200 |
| commit | 7601f59765a48bef329a429101eabcb0e2503634 (patch) | |
| tree | a2aaf32f43cda7428017f2fab62d3c5847e35ac4 /arch/powerpc/platforms/8xx | |
| parent | powerpc/fsl: Enable CONFIG_E1000E in mpc85xx_smp_defconfig (diff) | |
| download | linux-7601f59765a48bef329a429101eabcb0e2503634.tar.xz linux-7601f59765a48bef329a429101eabcb0e2503634.zip | |
powerpc/8xx: Erroneous double irq_eoi() on CPM IRQ in MPC8xx
irq_eoi() is already called by generic_handle_irq() so
it shall not be called a again
Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
Signed-off-by: Scott Wood <scottwood@freescale.com>
Diffstat (limited to 'arch/powerpc/platforms/8xx')
| -rw-r--r-- | arch/powerpc/platforms/8xx/m8xx_setup.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/arch/powerpc/platforms/8xx/m8xx_setup.c b/arch/powerpc/platforms/8xx/m8xx_setup.c index 806cbbd86ec6..587a2828b06c 100644 --- a/arch/powerpc/platforms/8xx/m8xx_setup.c +++ b/arch/powerpc/platforms/8xx/m8xx_setup.c @@ -219,19 +219,12 @@ void mpc8xx_restart(char *cmd) static void cpm_cascade(unsigned int irq, struct irq_desc *desc) { - struct irq_chip *chip; - int cascade_irq; - - if ((cascade_irq = cpm_get_irq()) >= 0) { - struct irq_desc *cdesc = irq_to_desc(cascade_irq); + struct irq_chip *chip = irq_desc_get_chip(desc); + int cascade_irq = cpm_get_irq(); + if (cascade_irq >= 0) generic_handle_irq(cascade_irq); - chip = irq_desc_get_chip(cdesc); - chip->irq_eoi(&cdesc->irq_data); - } - - chip = irq_desc_get_chip(desc); chip->irq_eoi(&desc->irq_data); } |