Changeset 11174 in vbox for trunk/src/VBox/Additions

Timestamp:

Aug 6, 2008 9:12:02 AM (16 years ago)

Author:

vboxsync

Message:

Linux guest additions: vboxadd: properly unregister the misc device

File:

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

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

@@ -1069 +1069 @@
                 vboxDev->vmmdevmem, vboxDev->vmmdevmem_size,
                 vboxDev->hypervisorStart, vboxDev->hypervisorSize));
-    Log(("Successfully loaded VirtualBox device version "
-           VBOX_VERSION_STRING " (interface " xstr(VMMDEV_VERSION) ")\n"));
+    printk(KERN_DEBUG "vboxadd: Successfully loaded version "
+            VBOX_VERSION_STRING " (interface " xstr(VMMDEV_VERSION) ")\n");
 
     /* successful return */
@@ -1079 +1079 @@
     PCI_DEV_PUT(pcidev);
     free_resources();
-    unregister_chrdev(vbox_major, "vboxadd");
+    if (vbox_major > 0)
+        unregister_chrdev(vbox_major, "vboxadd");
+    else
+        misc_deregister(&gMiscDevice);
     return err;
 }
@@ -1089 +1092 @@
 static __exit void fini(void)
 {
-    unregister_chrdev(vbox_major, "vboxadd");
+    if (vbox_major > 0)
+        unregister_chrdev(vbox_major, "vboxadd");
+    else
+        misc_deregister(&gMiscDevice);
     free_resources();
     vboxadd_cmc_fini ();