Changeset 90871 in vbox

Timestamp:

Aug 25, 2021 11:28:21 AM (3 years ago)

Author:

vboxsync

Message:

Solaris host: bugref:10089 VBoxUSBMon-solaris: Fixed getinfo() callback.

File:

• trunk/src/VBox/HostDrivers/VBoxUSB/solaris/VBoxUSBMon-solaris.c (modified) (2 diffs)

trunk/src/VBox/HostDrivers/VBoxUSB/solaris/VBoxUSBMon-solaris.c

@@ -304 +304 @@
 
             g_pDip = pDip;
-            int instance = ddi_get_instance(pDip);
-            int rc = ddi_create_priv_minor_node(pDip, DEVICE_NAME, S_IFCHR, instance, DDI_PSEUDO, 0,
-                                                        "none", "none", 0660);
+            int rc = ddi_create_priv_minor_node(pDip, DEVICE_NAME, S_IFCHR, 0 /* instance */, DDI_PSEUDO, 0 /* flags */,
+                                                "none", "none", 0660);
             if (rc == DDI_SUCCESS)
             {
@@ -402 +401 @@
     {
         case DDI_INFO_DEVT2DEVINFO:
+        {
             *ppvResult = (void *)g_pDip;
+            if (!*ppvResult)
+                rc = DDI_FAILURE;
             break;
+        }
 
         case DDI_INFO_DEVT2INSTANCE:
-            *ppvResult = (void *)(uintptr_t)ddi_get_instance(g_pDip);
+        {
+            /* There can only be a single-instance of this driver and thus its instance number is 0. */
+            *ppvResult = (void *)0;
             break;
+        }
 
         default: