MdeModulePkg/UsbMass: Revert changes of removing retry logic

[mirror_edk2.git] / MdeModulePkg / Bus / Usb / UsbMassStorageDxe / UsbMassBot.c

diff --git a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBot.c b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBot.c
index 9871d9359d1c8fdfbeb196da93dd3de3f9b3c7b4..4bb7222b89edd91c12610d9373c2bbe5f78b3eec 100644 (file)
--- a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBot.c
+++ b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBot.c
@@ -2,7 +2,7 @@
   Implementation of the USB mass storage Bulk-Only Transport protocol,\r
   according to USB Mass Storage Class Bulk-Only Transport, Revision 1.0.\r
 \r
-Copyright (c) 2007 - 2008, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2007 - 2011, Intel Corporation. All rights reserved.<BR>\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
@@ -13,8 +13,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
 **/\r
 \r
-#include "UsbMassBoot.h"\r
-#include "UsbMassBot.h"\r
+#include "UsbMass.h"\r
 \r
 //\r
 // Definition of USB BOT Transport Protocol\r
@@ -393,7 +392,7 @@ UsbBotGetStatus (
   @param  CmdStatus             The result of high level command execution\r
 \r
   @retval EFI_SUCCESS           The command is executed successfully.\r
-  @retval Other                 Failed to excute command\r
+  @retval Other                 Failed to execute command\r
 \r
 **/\r
 EFI_STATUS\r
@@ -484,7 +483,7 @@ UsbBotResetDevice (
     //\r
     Status = UsbBot->UsbIo->UsbPortReset (UsbBot->UsbIo);\r
     if (EFI_ERROR (Status)) {\r
-      return Status;\r
+      return EFI_DEVICE_ERROR;\r
     }\r
   }\r
 \r
@@ -510,7 +509,7 @@ UsbBotResetDevice (
                             );\r
 \r
   if (EFI_ERROR (Status)) {\r
-    return Status;\r
+    return EFI_DEVICE_ERROR;\r
   }\r
 \r
   //\r