powerpc/mpic: Don't init the fsl error int until after mpic init

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

Besides other potential problems, if MPIC_NO_RESET is not set,
the error interrupt will be masked after it is requested.

Signed-off-by: Scott Wood <scottwood@freescale.com>

Scott Wood 12 years ago aa80581d 0c0fc4d3

+4 -4

1 changed file

expand all

arch

powerpc

sysdev

mpic.c

+4 -4

arch/powerpc/sysdev/mpic.c

··· 1588 1588 num_timers = 8; 1589 1589 } 1590 1590 1591 - /* FSL mpic error interrupt intialization */ 1592 - if (mpic->flags & MPIC_FSL_HAS_EIMR) 1593 - mpic_err_int_init(mpic, MPIC_FSL_ERR_INT); 1594 - 1595 1591 /* Initialize timers to our reserved vectors and mask them for now */ 1596 1592 for (i = 0; i < num_timers; i++) { 1597 1593 unsigned int offset = mpic_tm_offset(mpic, i); ··· 1671 1675 irq_set_chained_handler(virq, &mpic_cascade); 1672 1676 } 1673 1677 } 1678 + 1679 + /* FSL mpic error interrupt intialization */ 1680 + if (mpic->flags & MPIC_FSL_HAS_EIMR) 1681 + mpic_err_int_init(mpic, MPIC_FSL_ERR_INT); 1674 1682 } 1675 1683 1676 1684 void __init mpic_set_clk_ratio(struct mpic *mpic, u32 clock_ratio)