1 files changed, 6 insertions, 5 deletions
diff --git a/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsBoot.c b/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsBoot.c
index 372cab5972..30c48f48ee 100644
--- a/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsBoot.c
+++ b/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsBoot.c
@@ -655,14 +655,16 @@ BdsLibBootViaBootOption (
   }
 
   //
-  // Expand USB Class or USB WWID drive path node to full device path.
+  // Signal the EVT_SIGNAL_READY_TO_BOOT event
   //
-  ImageHandle = BdsExpandUsbShortFormDevicePath (DevicePath);
+  EfiSignalEventReadyToBoot();
 
   //
-  // Signal the EVT_SIGNAL_READY_TO_BOOT event
+  // Expand USB Class or USB WWID device path node to be full device path of a USB
+  // device in platform then load the boot file on this full device path and get the
+  // image handle.
   //
-  EfiSignalEventReadyToBoot();
+  ImageHandle = BdsExpandUsbShortFormDevicePath (DevicePath);
 
   //
   // Adjust the different type memory page number just before booting
@@ -670,7 +672,6 @@ BdsLibBootViaBootOption (
   //
   BdsSetMemoryTypeInformationVariable ();
 
-
   //
   // Set Boot Current
   //