Changeset 065064e6 in mainline for uspace/lib/usbdev/src/devdrv.c

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/lib/usbdev/src/devdrv.c (modified) (4 diffs)

uspace/lib/usbdev/src/devdrv.c

@@ -152 +152 @@
         gen_dev->driver_data = dev;
 
-        return driver->ops->device_add(dev);
+        rc = driver->ops->device_add(dev);
+        if (rc != EOK)
+                usb_device_destroy(dev);
+        return rc;
 }
 /*----------------------------------------------------------------------------*/
@@ -185 +188 @@
         if (driver->ops->device_gone == NULL)
                 return ENOTSUP;
-        const int ret = driver->ops->device_gone(gen_dev->driver_data);
+        usb_device_t *usb_dev = gen_dev->driver_data;
+        const int ret = driver->ops->device_gone(usb_dev);
         if (ret == EOK)
-                usb_device_destroy(gen_dev->driver_data);
+                usb_device_destroy(usb_dev);
 
         return ret;
@@ -595 +599 @@
 
         /* Ignore errors and hope for the best. */
-        usb_device_destroy_pipes(dev->ddf_dev, dev->pipes, dev->pipes_count);
-        free(dev->descriptors.configuration);
+        destroy_current_pipes(dev);
 
         if (dev->alternate_interfaces != NULL) {
@@ -602 +605 @@
         }
         free(dev->alternate_interfaces);
-
-        free(dev);
+        free(dev->descriptors.configuration);
+        free(dev->driver_data);
+}
+
+void * usb_device_data_alloc(usb_device_t *usb_dev, size_t size)
+{
+        assert(usb_dev);
+        assert(usb_dev->driver_data == NULL);
+        return usb_dev->driver_data = calloc(1, size);
+
 }