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

Timestamp:

2011-08-29T23:00:12Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

58cbb0c8

Parents:

c5be39b

Message:

Leave it up to DDF to free driver-specific data. This makes it possible
to ensure soft state is not freed during calls to driver entry points.

This requires some driver changes:

• minimum change is not to free() driver-data structures (ddf_fun_t.driver_data and ddf_dev_t.driver_data)
• ideally allocate using ddf_dev_data_alloc(), ddf_fun_data_alloc()

I tried fixing existing drivers accordingly (mostly the minimalistic
change variant), but could have missed something.

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");
@@ -170 +159 @@
 
         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;
 
@@ -227 +228 @@
         if (fun_name != NULL)
                 free(fun_name);
-        if (mfun != NULL)
-                free(mfun);
         return rc;
 }