Changeset d7ff048 in mainline for uspace/drv/bus/usb/usbmast/main.c

Timestamp:

2011-10-08T13:08:53Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

bf08ff0

Parents:

8367d1d (diff), 80099c19 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

File:

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

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

@@ -94 +94 @@
 
         /* Allocate softstate */
-        mdev = calloc(1, sizeof(usbmast_dev_t));
+        mdev = ddf_dev_data_alloc(dev->ddf_dev, sizeof(usbmast_dev_t));
         if (mdev == NULL) {
                 usb_log_error("Failed allocating softstate.\n");
-                rc = ENOMEM;
-                goto error;
+                return ENOMEM;
         }
 
@@ -125 +124 @@
 error:
         /* XXX Destroy functions */
-        if (mdev != NULL)
-                free(mdev);
         return rc;
 }
@@ -158 +155 @@
         }
 
-        free(fun_name);
-
         /* Allocate soft state */
-        mfun = ddf_dev_data_alloc(mdev->ddf_dev, sizeof(usbmast_fun_t));
+        mfun = ddf_fun_data_alloc(fun, sizeof(usbmast_fun_t));
         if (mfun == NULL) {
                 usb_log_error("Failed allocating softstate.\n");
@@ -171 +166 @@
         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");
@@ -219 +211 @@
                 goto error;
         }
+
+        free(fun_name);
 
         return EOK;