Changeset 7555 in vbox for trunk/src/VBox/Additions/linux/module

Timestamp:

Mar 25, 2008 3:49:53 PM (17 years ago)

Author:

vboxsync

Message:

vboxadd: fixed error code if init() fails

File:

• trunk/src/VBox/Additions/linux/module/vboxmod.c (modified) (10 diffs)

trunk/src/VBox/Additions/linux/module/vboxmod.c

@@ -882 +882 @@
     {
         LogRelFunc(("did not find expected hardware resources!\n"));
+        err = -ENXIO;
         goto fail;
     }
@@ -889 +890 @@
     {
         LogRelFunc(("failed to request adapter memory!\n"));
+        err = -ENXIO;
         goto fail;
     }
@@ -898 +900 @@
     {
         LogRelFunc(("ioremap failed\n"));
+        err = -ENOMEM;
         goto fail;
     }
@@ -905 +908 @@
         LogRelFunc(("invalid VMM device memory version! (got 0x%x, expected 0x%x)\n",
                     vboxDev->pVMMDevMemory->u32Version, VMMDEV_MEMORY_VERSION));
+        err = -ENXIO;
         goto fail;
     }
@@ -913 +917 @@
     {
         LogRelFunc(("could not initialize VBGL subsystem! rc = %Vrc\n", rcVBox));
+        err = -ENXIO;
         goto fail;
     }
@@ -922 +927 @@
     {
         LogRelFunc(("could not allocate request structure! rc = %Vrc\n", rcVBox));
+        err = -ENOMEM;
         goto fail;
     }
@@ -938 +944 @@
                     rcVBox, infoReq->header.rc));
         VbglGRFree(&infoReq->header);
+        err = -ENXIO;
         goto fail;
     }
@@ -955 +962 @@
         {
             LogRelFunc(("could not allocate request structure! rc = %Vrc\n", rcVBox));
+            err = -ENOMEM;
             goto fail;
         }
@@ -962 +970 @@
         VbglGRFree(&vmmreqGuestCaps->header);
         if (RT_FAILURE(rcVBox))
+        {
+            err = -ENXIO;
             goto fail;
+        }
     }
 
@@ -977 +988 @@
     {
         LogRelFunc(("could not allocate request structure! rc = %Vrc\n", rcVBox));
+        err = -ENOMEM;
         goto fail;
     }