Index: uspace/drv/bus/usb/usbmast/main.c
===================================================================
--- uspace/drv/bus/usb/usbmast/main.c	(revision 3002434fa388f59c77ee7bd7c849335a51dbc72a)
+++ uspace/drv/bus/usb/usbmast/main.c	(revision 065064e6a50bbc4c53be7985e161ce57985dd86b)
@@ -103,5 +103,4 @@
 	}
 	free(mdev->luns);
-	free(mdev);
 	return EOK;
 }
@@ -119,5 +118,5 @@
 
 	/* Allocate softstate */
-	dev->driver_data = mdev = malloc(sizeof(usbmast_dev_t));
+	mdev = usb_device_data_alloc(dev, sizeof(usbmast_dev_t));
 	if (mdev == NULL) {
 		usb_log_error("Failed allocating softstate.\n");