Index: uspace/srv/devman/main.c
===================================================================
--- uspace/srv/devman/main.c	(revision 609243f4f1d6e7562d9c9b79e38925b36e844ac0)
+++ uspace/srv/devman/main.c	(revision 1bc35b5107055e337dd8c8f42e37c47db3ecb6f5)
@@ -1309,10 +1309,11 @@
 
 	/*
-	 * !!! 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.
+	 * 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.
 	 */
-	loc_server_register(NAME, devman_connection);
+	loc_server_register(NAME);
 	
 	return true;
@@ -1325,9 +1326,4 @@
 	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;
 	}
@@ -1338,4 +1334,9 @@
 	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) {