Index: uspace/srv/bd/ata_bd/ata_bd.c
===================================================================
--- uspace/srv/bd/ata_bd/ata_bd.c	(revision 622dea83a1bf05d07d10fd5756c5f5757a2f4b12)
+++ uspace/srv/bd/ata_bd/ata_bd.c	(revision 7ea7db31d35d3bcb84a5f1220696fa0c75b775c3)
@@ -171,5 +171,4 @@
 		rc = devmap_device_register(name, &disk[i].devmap_handle);
 		if (rc != EOK) {
-			devmap_hangup_phone(DEVMAP_DRIVER);
 			printf(NAME ": Unable to register device %s.\n", name);
 			return rc;
Index: uspace/srv/bd/file_bd/file_bd.c
===================================================================
--- uspace/srv/bd/file_bd/file_bd.c	(revision 622dea83a1bf05d07d10fd5756c5f5757a2f4b12)
+++ uspace/srv/bd/file_bd/file_bd.c	(revision 7ea7db31d35d3bcb84a5f1220696fa0c75b775c3)
@@ -120,5 +120,4 @@
 	rc = devmap_device_register(device_name, &devmap_handle);
 	if (rc != EOK) {
-		devmap_hangup_phone(DEVMAP_DRIVER);
 		printf(NAME ": Unable to register device '%s'.\n",
 			device_name);
Index: uspace/srv/bd/gxe_bd/gxe_bd.c
===================================================================
--- uspace/srv/bd/gxe_bd/gxe_bd.c	(revision 622dea83a1bf05d07d10fd5756c5f5757a2f4b12)
+++ uspace/srv/bd/gxe_bd/gxe_bd.c	(revision 7ea7db31d35d3bcb84a5f1220696fa0c75b775c3)
@@ -145,5 +145,4 @@
 		rc = devmap_device_register(name, &devmap_handle[i]);
 		if (rc != EOK) {
-			devmap_hangup_phone(DEVMAP_DRIVER);
 			printf(NAME ": Unable to register device %s.\n", name);
 			return rc;
Index: uspace/srv/bd/part/guid_part/guid_part.c
===================================================================
--- uspace/srv/bd/part/guid_part/guid_part.c	(revision 622dea83a1bf05d07d10fd5756c5f5757a2f4b12)
+++ uspace/srv/bd/part/guid_part/guid_part.c	(revision 7ea7db31d35d3bcb84a5f1220696fa0c75b775c3)
@@ -191,5 +191,4 @@
 		rc = devmap_device_register(name, &dev);
 		if (rc != EOK) {
-			devmap_hangup_phone(DEVMAP_DRIVER);
 			printf(NAME ": Unable to register device %s.\n", name);
 			return rc;
Index: uspace/srv/bd/part/mbr_part/mbr_part.c
===================================================================
--- uspace/srv/bd/part/mbr_part/mbr_part.c	(revision 622dea83a1bf05d07d10fd5756c5f5757a2f4b12)
+++ uspace/srv/bd/part/mbr_part/mbr_part.c	(revision 7ea7db31d35d3bcb84a5f1220696fa0c75b775c3)
@@ -242,5 +242,4 @@
 		rc = devmap_device_register(name, &dev);
 		if (rc != EOK) {
-			devmap_hangup_phone(DEVMAP_DRIVER);
 			printf(NAME ": Unable to register device %s.\n", name);
 			return rc;
Index: uspace/srv/bd/rd/rd.c
===================================================================
--- uspace/srv/bd/rd/rd.c	(revision 622dea83a1bf05d07d10fd5756c5f5757a2f4b12)
+++ uspace/srv/bd/rd/rd.c	(revision 7ea7db31d35d3bcb84a5f1220696fa0c75b775c3)
@@ -241,5 +241,4 @@
 	devmap_handle_t devmap_handle;
 	if (devmap_device_register("bd/initrd", &devmap_handle) != EOK) {
-		devmap_hangup_phone(DEVMAP_DRIVER);
 		printf("%s: Unable to register device\n", NAME);
 		return false;
Index: uspace/srv/fs/devfs/devfs_ops.c
===================================================================
--- uspace/srv/fs/devfs/devfs_ops.c	(revision 622dea83a1bf05d07d10fd5756c5f5757a2f4b12)
+++ uspace/srv/fs/devfs/devfs_ops.c	(revision 7ea7db31d35d3bcb84a5f1220696fa0c75b775c3)
@@ -454,7 +454,4 @@
 		return false;
 	
-	if (devmap_get_phone(DEVMAP_CLIENT, IPC_FLAG_BLOCKING) < 0)
-		return false;
-	
 	return true;
 }
Index: uspace/srv/hid/console/console.c
===================================================================
--- uspace/srv/hid/console/console.c	(revision 622dea83a1bf05d07d10fd5756c5f5757a2f4b12)
+++ uspace/srv/hid/console/console.c	(revision 7ea7db31d35d3bcb84a5f1220696fa0c75b775c3)
@@ -816,5 +816,4 @@
 			
 			if (devmap_device_register(vc, &consoles[i].devmap_handle) != EOK) {
-				devmap_hangup_phone(DEVMAP_DRIVER);
 				printf(NAME ": Unable to register device %s\n", vc);
 				return false;
Index: uspace/srv/hid/s3c24xx_ts/s3c24xx_ts.c
===================================================================
--- uspace/srv/hid/s3c24xx_ts/s3c24xx_ts.c	(revision 622dea83a1bf05d07d10fd5756c5f5757a2f4b12)
+++ uspace/srv/hid/s3c24xx_ts/s3c24xx_ts.c	(revision 7ea7db31d35d3bcb84a5f1220696fa0c75b775c3)
@@ -102,5 +102,4 @@
 	rc = devmap_device_register(NAMESPACE "/mouse", &ts->devmap_handle);
 	if (rc != EOK) {
-		devmap_hangup_phone(DEVMAP_DRIVER);
 		printf(NAME ": Unable to register device %s.\n",
 		    NAMESPACE "/mouse");
Index: uspace/srv/hw/bus/cuda_adb/cuda_adb.c
===================================================================
--- uspace/srv/hw/bus/cuda_adb/cuda_adb.c	(revision 622dea83a1bf05d07d10fd5756c5f5757a2f4b12)
+++ uspace/srv/hw/bus/cuda_adb/cuda_adb.c	(revision 7ea7db31d35d3bcb84a5f1220696fa0c75b775c3)
@@ -162,5 +162,4 @@
 	rc = devmap_device_register("adb/kbd", &devmap_handle);
 	if (rc != EOK) {
-		devmap_hangup_phone(DEVMAP_DRIVER);
 		printf(NAME ": Unable to register device %s.\n", "adb/kdb");
 		return rc;
@@ -172,5 +171,4 @@
 	rc = devmap_device_register("adb/mouse", &devmap_handle);
 	if (rc != EOK) {
-		devmap_hangup_phone(DEVMAP_DRIVER);
 		printf(NAME ": Unable to register device %s.\n", "adb/mouse");
 		return rc;
Index: uspace/srv/hw/char/i8042/i8042.c
===================================================================
--- uspace/srv/hw/char/i8042/i8042.c	(revision 622dea83a1bf05d07d10fd5756c5f5757a2f4b12)
+++ uspace/srv/hw/char/i8042/i8042.c	(revision 7ea7db31d35d3bcb84a5f1220696fa0c75b775c3)
@@ -148,5 +148,4 @@
 		rc = devmap_device_register(name, &i8042_port[i].devmap_handle);
 		if (rc != EOK) {
-			devmap_hangup_phone(DEVMAP_DRIVER);
 			printf(NAME ": Unable to register device %s.\n", name);
 			return rc;
Index: uspace/srv/hw/char/s3c24xx_uart/s3c24xx_uart.c
===================================================================
--- uspace/srv/hw/char/s3c24xx_uart/s3c24xx_uart.c	(revision 622dea83a1bf05d07d10fd5756c5f5757a2f4b12)
+++ uspace/srv/hw/char/s3c24xx_uart/s3c24xx_uart.c	(revision 7ea7db31d35d3bcb84a5f1220696fa0c75b775c3)
@@ -95,5 +95,4 @@
 	rc = devmap_device_register(NAMESPACE "/" NAME, &uart->devmap_handle);
 	if (rc != EOK) {
-		devmap_hangup_phone(DEVMAP_DRIVER);
 		printf(NAME ": Unable to register device %s.\n",
 		    NAMESPACE "/" NAME);