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

File:

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

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

@@ -94 +94 @@
 
         /* Allocate softstate */
-        mdev = ddf_dev_data_alloc(dev->ddf_dev, sizeof(usbmast_dev_t));
+        mdev = calloc(1, sizeof(usbmast_dev_t));
         if (mdev == NULL) {
                 usb_log_error("Failed allocating softstate.\n");
-                return ENOMEM;
+                rc = ENOMEM;
+                goto error;
         }
 
@@ -124 +125 @@
 error:
         /* XXX Destroy functions */
+        if (mdev != NULL)
+                free(mdev);
         return rc;
 }
@@ -155 +158 @@
         }
 
+        free(fun_name);
+
         /* Allocate soft state */
-        mfun = ddf_fun_data_alloc(fun, sizeof(usbmast_fun_t));
+        mfun = ddf_dev_data_alloc(mdev->ddf_dev, sizeof(usbmast_fun_t));
         if (mfun == NULL) {
                 usb_log_error("Failed allocating softstate.\n");
@@ -166 +171 @@
         mfun->lun = lun;
 
+        fun_name = NULL;
+
         /* Set up a connection handler. */
         fun->conn_handler = usbmast_bd_connection;
+        fun->driver_data = mfun;
 
         usb_log_debug("Inquire...\n");
@@ -211 +219 @@
                 goto error;
         }
-
-        free(fun_name);
 
         return EOK;