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

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/usbhub/usbhub.c (modified) (3 diffs)

uspace/drv/bus/usb/usbhub/usbhub.c

@@ -117 +117 @@
         ddf_fun_destroy(hub->hub_fun);
 
-        free(hub);
-        usb_dev->driver_data = NULL;
         usb_log_info("USB hub driver, stopped and cleaned.\n");
         return EOK;
@@ -254 +252 @@
 {
         assert(usb_dev);
-        usb_hub_dev_t *hub_dev = malloc(sizeof(usb_hub_dev_t));
+        usb_hub_dev_t *hub_dev =
+            usb_device_data_alloc(usb_dev, sizeof(usb_hub_dev_t));
         if (!hub_dev)
             return NULL;
 
         hub_dev->usb_device = usb_dev;
-
         hub_dev->ports = NULL;
         hub_dev->port_count = 0;
@@ -266 +264 @@
         fibril_mutex_initialize(&hub_dev->pending_ops_mutex);
         fibril_condvar_initialize(&hub_dev->pending_ops_cv);
-        usb_dev->driver_data = hub_dev;
 
         return hub_dev;