Changeset 29941 in vbox for trunk

Timestamp:

Jun 1, 2010 11:49:49 AM (15 years ago)

Author:

vboxsync

Message:

ATAController: Fix rc usage

File:

• trunk/src/VBox/Devices/Storage/ATAController.cpp (modified) (2 diffs)

trunk/src/VBox/Devices/Storage/ATAController.cpp

@@ -5132 +5132 @@
 int  ataControllerAttach(PAHCIATACONTROLLER pCtl, PPDMIBASE pDrvBase, bool fMaster)
 {
-    AHCIATADevState    *pIf;
-    int             rc;
+    AHCIATADevState *pIf;
+    int              rc = VINF_SUCCESS;
 
     /*
@@ -5154 +5154 @@
     {
         rc = ataConfigLun(pCtl->pDevInsR3, pIf);
-    }
-    else
-        AssertMsgFailed(("Failed to attach LUN#%d. rc=%Rrc\n", pIf->iLUN, rc));
-
-    if (RT_FAILURE(rc))
-    {
-        pIf->pDrvBase = NULL;
-        pIf->pDrvBlock = NULL;
-    }
+        AssertRC(rc);
+
+        if (RT_FAILURE(rc))
+        {
+            pIf->pDrvBase = NULL;
+            pIf->pDrvBlock = NULL;
+        }
+    }
+
     return rc;
 }