Index: uspace/lib/drv/generic/driver.c
===================================================================
--- uspace/lib/drv/generic/driver.c	(revision 676900501376128cbb87ed9ea866e1bfbb52a5db)
+++ uspace/lib/drv/generic/driver.c	(revision 377818191c87c5eca4e9c6ab5eb18e5d7d8b9103)
@@ -339,5 +339,5 @@
 {
 	/* Accept connection */
-	async_answer_5(icall, EOK, 0, 0, 0, 0, async_get_label());
+	async_accept_0(icall);
 
 	while (true) {
@@ -419,9 +419,11 @@
 		ret = (*fun->ops->open)(fun);
 
-	async_answer_5(icall, ret, 0, 0, 0, 0, async_get_label());
 	if (ret != EOK) {
+		async_answer_0(icall, ret);
 		fun_del_ref(fun);
 		return;
 	}
+
+	async_accept_0(icall);
 
 	while (true) {