Changes in uspace/drv/bus/usb/usbmast/main.c [5f6e25e:2aceec5] in mainline

File:

• uspace/drv/bus/usb/usbmast/main.c (modified) (3 diffs)

uspace/drv/bus/usb/usbmast/main.c

@@ -145 +145 @@
         usbmast_fun_t *mfun = NULL;
 
+        /* Allocate softstate */
+        mfun = calloc(1, sizeof(usbmast_fun_t));
+        if (mfun == NULL) {
+                usb_log_error("Failed allocating softstate.\n");
+                rc = ENOMEM;
+                goto error;
+        }
+
+        mfun->mdev = mdev;
+        mfun->lun = lun;
+
         if (asprintf(&fun_name, "l%u", lun) < 0) {
                 usb_log_error("Out of memory.\n");
@@ -159 +170 @@
 
         free(fun_name);
-
-        /* Allocate soft state */
-        mfun = ddf_dev_data_alloc(mdev->ddf_dev, sizeof(usbmast_fun_t));
-        if (mfun == NULL) {
-                usb_log_error("Failed allocating softstate.\n");
-                rc = ENOMEM;
-                goto error;
-        }
-
-        mfun->mdev = mdev;
-        mfun->lun = lun;
-
         fun_name = NULL;
 
@@ -228 +227 @@
         if (fun_name != NULL)
                 free(fun_name);
+        if (mfun != NULL)
+                free(mfun);
         return rc;
 }