Index: uspace/drv/test/test1/test1.c
===================================================================
--- uspace/drv/test/test1/test1.c	(revision 1a5b2521ea58a25aa1f13d0850fa06ae93fba965)
+++ uspace/drv/test/test1/test1.c	(revision fb4c877b5a2e89c57f7d1e3d731e386508596fbd)
@@ -148,7 +148,7 @@
 	    dev->name, (int) dev->handle);
 
-	test1 = calloc(1, sizeof(test1_t));
+	test1 = ddf_dev_data_alloc(dev, sizeof(test1_t));
 	if (test1 == NULL) {
-		ddf_msg(LVL_ERROR, "Failed allocating softstate.\n");
+		ddf_msg(LVL_ERROR, "Failed allocating soft state.\n");
 		return ENOMEM;
 	}
@@ -159,4 +159,6 @@
 		return ENOMEM;
 	}
+
+	test1->fun_a = fun_a;
 
 	rc = ddf_fun_bind(fun_a);
@@ -187,6 +189,4 @@
 	ddf_msg(LVL_DEBUG, "Device `%s' accepted.", dev->name);
 
-	test1->fun_a = fun_a;
-	dev->driver_data = test1;
 	return EOK;
 }