Changes in uspace/lib/drv/generic/driver.c [ca48672:8300c72] in mainline

File:

• uspace/lib/drv/generic/driver.c (modified) (5 diffs)

uspace/lib/drv/generic/driver.c

@@ -1046 +1046 @@
 errno_t ddf_driver_main(const driver_t *drv)
 {
-        port_id_t drv_port;
-        port_id_t devman_port;
-
         /*
          * Remember the driver structure - driver_ops will be called by generic
@@ -1059 +1056 @@
          * incoming connections.
          */
-        errno_t rc = async_create_port(INTERFACE_DDF_DRIVER,
-            driver_connection_driver, NULL, &drv_port);
+        port_id_t port;
+        errno_t rc = async_create_port(INTERFACE_DDF_DRIVER, driver_connection_driver,
+            NULL, &port);
         if (rc != EOK) {
                 printf("Error: Failed to create driver port.\n");
@@ -1067 +1065 @@
 
         rc = async_create_port(INTERFACE_DDF_DEVMAN, driver_connection_devman,
-            NULL, &devman_port);
+            NULL, &port);
         if (rc != EOK) {
                 printf("Error: Failed to create devman port.\n");
-                async_port_destroy(drv_port);
                 return rc;
         }
@@ -1081 +1078 @@
                     "(%s).\n", (rc == EEXIST) ? "driver already started" :
                     str_error(rc));
-                async_port_destroy(devman_port);
-                async_port_destroy(drv_port);
+
                 return rc;
         }
@@ -1090 +1086 @@
         if (rc != EOK) {
                 printf("Error: Failed returning task value.\n");
-                // XXX devman_driver_unregister
-                async_port_destroy(devman_port);
-                async_port_destroy(drv_port);
                 return rc;
         }