Index: /trunk/src/VBox/Devices/Storage/ATAController.cpp
===================================================================
--- /trunk/src/VBox/Devices/Storage/ATAController.cpp	(revision 29940)
+++ /trunk/src/VBox/Devices/Storage/ATAController.cpp	(revision 29941)
@@ -5132,6 +5132,6 @@
 int  ataControllerAttach(PAHCIATACONTROLLER pCtl, PPDMIBASE pDrvBase, bool fMaster)
 {
-    AHCIATADevState    *pIf;
-    int             rc;
+    AHCIATADevState *pIf;
+    int              rc = VINF_SUCCESS;
 
     /*
@@ -5154,13 +5154,13 @@
     {
         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;
 }