Changeset 065064e6 in mainline for uspace/drv/bus/usb/usbmast

Timestamp:

2011-10-15T12:49:18Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

e3f7418

Parents:

7c95d6f5

Message:

usb: Add and use usb_device_data_alloc.

Inspired by ddf_dev_data_alloc and ddf_fun_data_alloc.
Fix possible double free (hid dev and hid fun shared driver_data).

File:

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

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

@@ -103 +103 @@
         }
         free(mdev->luns);
-        free(mdev);
         return EOK;
 }
@@ -119 +118 @@
 
         /* 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");