diff --git a/XilinxProcessorIPLib/drivers/emacps/src/xemacps_bdring.c b/XilinxProcessorIPLib/drivers/emacps/src/xemacps_bdring.c
index e9c4279e..eac53e59 100755
--- a/XilinxProcessorIPLib/drivers/emacps/src/xemacps_bdring.c
+++ b/XilinxProcessorIPLib/drivers/emacps/src/xemacps_bdring.c
@@ -653,11 +653,11 @@ u32 XEmacPs_BdRingFromHwTx(XEmacPs_BdRing * RingPtr, u32 BdLimit,
 	u32 BdCount;
 	u32 BdPartialCount;
 	u32 Sop = 0U;
+	u32 Status;
 	u32 BdLimitLoc = BdLimit;
 	CurBdPtr = RingPtr->HwHead;
 	BdCount = 0U;
 	BdPartialCount = 0U;
-	u32 Status;
 
 	/* If no BDs in work group, then there's nothing to search */
 	if (RingPtr->HwCnt == 0x00000000U) {
diff --git a/XilinxProcessorIPLib/drivers/emacps/src/xemacps_intr.c b/XilinxProcessorIPLib/drivers/emacps/src/xemacps_intr.c
index fcaab06e..40bde82b 100755
--- a/XilinxProcessorIPLib/drivers/emacps/src/xemacps_intr.c
+++ b/XilinxProcessorIPLib/drivers/emacps/src/xemacps_intr.c
@@ -146,7 +146,7 @@ void XEmacPs_IntrHandler(void *XEmacPsPtr)
 	u32 RegISR;
 	u32 RegSR;
 	u32 RegCtrl;
-	u32 RegQ1ISR;
+	u32 RegQ1ISR = 0U;
 	XEmacPs *InstancePtr = (XEmacPs *) XEmacPsPtr;
 
 	Xil_AssertVoid(InstancePtr != NULL);