Changes in uspace/srv/devman/main.c [f302586:a96a982] in mainline

File:

• uspace/srv/devman/main.c (modified) (4 diffs)

uspace/srv/devman/main.c

@@ -634 +634 @@
                                 fibril_rwlock_read_unlock(&device_tree.rwlock);
                                 dev_del_ref(dev);
-                                if (gone_rc == EOK)
-                                        gone_rc = ENOTSUP;
-                                async_answer_0(callid, gone_rc);
                                 return;
                         }
@@ -1309 +1306 @@
 
         /*
-         * Caution: As the device manager is not a real loc
-         * driver (it uses a completely different IPC protocol
-         * than an ordinary loc driver), forwarding a connection
-         * from client to the devman by location service will
-         * not work.
+         * !!! devman_connection ... as the device manager is not a real loc
+         * driver (it uses a completely different ipc protocol than an ordinary
+         * loc driver) forwarding a connection from client to the devman by
+         * location service would not work.
          */
-        loc_server_register(NAME);
+        loc_server_register(NAME, devman_connection);
         
         return true;
@@ -1326 +1322 @@
         if (log_init(NAME, LVL_WARN) != EOK) {
                 printf(NAME ": Error initializing logging subsystem.\n");
+                return -1;
+        }
+
+        if (!devman_init()) {
+                log_msg(LVL_ERROR, "Error while initializing service.");
                 return -1;
         }
@@ -1334 +1335 @@
         async_set_client_connection(devman_connection);
 
-        if (!devman_init()) {
-                log_msg(LVL_ERROR, "Error while initializing service.");
-                return -1;
-        }
-
         /* Register device manager at naming service. */
         if (service_register(SERVICE_DEVMAN) != EOK) {