1 files changed, 4 insertions, 3 deletions
diff --git a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBus.c b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBus.c
index d0def777bd..1b66e75f67 100644
--- a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBus.c
+++ b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBus.c
@@ -849,8 +849,9 @@ UsbIoPortReset (
   Address       = Dev->Address;
   Dev->Address  = 0;
   Status        = UsbSetAddress (Dev, Address);
-  Dev->Address  = Address;
-  
+
+  gBS->Stall (USB_SET_DEVICE_ADDRESS_STALL);  
+
   if (EFI_ERROR (Status)) {
     DEBUG (( EFI_D_ERROR, "UsbIoPortReset: failed to set address for device %d - %r\n",
                 Address, Status));
@@ -858,7 +859,7 @@ UsbIoPortReset (
     goto ON_EXIT;
   }
 
-  gBS->Stall (USB_SET_DEVICE_ADDRESS_STALL);
+  Dev->Address  = Address;
 
   DEBUG (( EFI_D_INFO, "UsbIoPortReset: device is now ADDRESSED at %d\n", Address));