Fix Cortex-M3 nested interrupt hard fault

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3119 42af7a65-404d-4744-a932-0658087f49c3

2 files changed, 7 insertions, 7 deletions

diff --git a/nuttx/arch/arm/src/lpc17xx/lpc17_ethernet.c b/nuttx/arch/arm/src/lpc17xx/lpc17_ethernet.c
index dc9c8b2c6..6742b33a2 100644
--- a/nuttx/arch/arm/src/lpc17xx/lpc17_ethernet.c
+++ b/nuttx/arch/arm/src/lpc17xx/lpc17_ethernet.c
@@ -1124,7 +1124,6 @@ static int lpc17_interrupt(int irq, void *context)
           lpc17_putreg(ETH_INT_WKUP, LPC17_ETH_INTCLR);
           EMAC_STAT(priv, wol);
 #         warning "Missing logic"
-          goto intexit;
         }
       else
 #endif
diff --git a/nuttx/arch/arm/src/lpc17xx/lpc17_vectors.S b/nuttx/arch/arm/src/lpc17xx/lpc17_vectors.S
index ae36da345..ed0f10fad 100755
--- a/nuttx/arch/arm/src/lpc17xx/lpc17_vectors.S
+++ b/nuttx/arch/arm/src/lpc17xx/lpc17_vectors.S
@@ -295,17 +295,18 @@ lpc17_common:
 2:

 	msr		msp, r1					/* Recover the return MSP value */

 

-	/* Do we need to restore interrupts? Why not just: msr primask, r3 */

+	/* Restore the interrupt state.  Preload r14 with the special return

+	 * value first (so that the return actually occurs with interrupts

+	 * still disabled).

+	 */

 

-	tst		r3, #1					/* PRIMASK bit 1=1 means that interrupts are masked */

-	bne		3f

-	cpsie	i						/* Restore interrupts */

+	ldr		r14, =EXC_RETURN		/* Load the special value */

+	msr		primask, r3				/* Restore interrupts */

 

 	/* Always return with R14 containing the special value that will: (1)

 	 * return to thread mode, and (2) continue to use the MSP

 	 */

-3:

-	ldr		r14, =EXC_RETURN		/* Load the special value */

+

 	bx		r14						/* And return */

 	.size	handlers, .-handlers