--- ipmi_hpmfwupg.c.orij	2007-08-10 15:58:25.115334000 -0700
+++ ipmi_hpmfwupg.c	2007-08-10 15:58:21.164830000 -0700
@@ -1816,16 +1816,6 @@
                unsigned char  componentIdByte = 0x00;
    
 
-               /* Send initiate command */
-               initUpgActionCmd.req.componentsMask = pActionRecord->components;
-              /* Action is upgrade */
-               initUpgActionCmd.req.upgradeAction  = HPMFWUPG_UPGRADE_ACTION_UPGRADE;
-               rc = HpmfwupgInitiateUpgradeAction(intf, &initUpgActionCmd, pFwupgCtx);
-               
-               if (rc != HPMFWUPG_SUCCESS)
-			   {
-			 		break;
-			   }
                /* Save component ID on which the upload is done */
                componentIdByte = pActionRecord->components.ComponentBits.byte;
                while ((componentIdByte>>=1)!=0)
@@ -1897,6 +1887,17 @@
                      pImagePtr = pDataInitial + firmwareLength;
                      break;
                   }
+                
+                  /* Send initiate command */
+                 initUpgActionCmd.req.componentsMask = pActionRecord->components;
+                 /* Action is upgrade */
+                 initUpgActionCmd.req.upgradeAction  = HPMFWUPG_UPGRADE_ACTION_UPGRADE;
+                 rc = HpmfwupgInitiateUpgradeAction(intf, &initUpgActionCmd, pFwupgCtx);
+               
+                 if (rc != HPMFWUPG_SUCCESS)
+		 {
+			break;
+		 }
                   
                   pVersionInfo = (VERSIONINFO*) &gVersionInfo[componentId];