diff options
author | Shaohui Xie <Shaohui.Xie@freescale.com> | 2011-06-02 22:45:11 -0400 |
---|---|---|
committer | Kumar Gala <galak@kernel.crashing.org> | 2011-06-03 01:09:09 -0400 |
commit | 704102a6799ecf7c1b268a43452761dae335f29c (patch) | |
tree | 42813e5451f0454262a8cf5054a0fb453583e24e /arch/powerpc | |
parent | fb9be2349f099d7c68b706e04fd62c478d3c0ed2 (diff) |
powerpc/85xx: fix race bug of calling request_irq after enable elbc interrupts
Signed-off-by: Shaohui Xie <Shaohui.Xie@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc')
-rw-r--r-- | arch/powerpc/sysdev/fsl_lbc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/powerpc/sysdev/fsl_lbc.c b/arch/powerpc/sysdev/fsl_lbc.c index 0608b1657da4..d917573cf1a8 100644 --- a/arch/powerpc/sysdev/fsl_lbc.c +++ b/arch/powerpc/sysdev/fsl_lbc.c | |||
@@ -196,9 +196,6 @@ static int __devinit fsl_lbc_ctrl_init(struct fsl_lbc_ctrl *ctrl, | |||
196 | out_be32(&lbc->lteccr, LTECCR_CLEAR); | 196 | out_be32(&lbc->lteccr, LTECCR_CLEAR); |
197 | out_be32(&lbc->ltedr, LTEDR_ENABLE); | 197 | out_be32(&lbc->ltedr, LTEDR_ENABLE); |
198 | 198 | ||
199 | /* Enable interrupts for any detected events */ | ||
200 | out_be32(&lbc->lteir, LTEIR_ENABLE); | ||
201 | |||
202 | /* Set the monitor timeout value to the maximum for erratum A001 */ | 199 | /* Set the monitor timeout value to the maximum for erratum A001 */ |
203 | if (of_device_is_compatible(node, "fsl,elbc")) | 200 | if (of_device_is_compatible(node, "fsl,elbc")) |
204 | clrsetbits_be32(&lbc->lbcr, LBCR_BMT, LBCR_BMTPS); | 201 | clrsetbits_be32(&lbc->lbcr, LBCR_BMT, LBCR_BMTPS); |
@@ -322,6 +319,9 @@ static int __devinit fsl_lbc_ctrl_probe(struct platform_device *dev) | |||
322 | goto err; | 319 | goto err; |
323 | } | 320 | } |
324 | 321 | ||
322 | /* Enable interrupts for any detected events */ | ||
323 | out_be32(&fsl_lbc_ctrl_dev->regs->lteir, LTEIR_ENABLE); | ||
324 | |||
325 | return 0; | 325 | return 0; |
326 | 326 | ||
327 | err: | 327 | err: |