Changeset 5153b58 in mainline

Timestamp:

2011-11-05T17:55:01Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

9f583151

Parents:

207acc4e

Message:

usbmid: Minor refactoring. Fix possible corruption in error path.

Location:

uspace/drv/bus/usb/usbmid

Files:

• main.c (modified) (5 diffs)
• usbmid.c (modified) (2 diffs)

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

@@ -68 +68 @@
 /** Callback when a MID device is about to be removed from the host.
  *
- * @param gen_dev Generic DDF device representing the removed device.
+ * @param dev USB device representing the removed device.
  * @return Error code.
  */
@@ -74 +74 @@
 {
         assert(dev);
+        usb_mid_t *usb_mid = dev->driver_data;
+        assert(usb_mid);
 
         /* Remove ctl function */
-        usb_mid_t *usb_mid = dev->driver_data;
         int ret = ddf_fun_unbind(usb_mid->ctl_fun);
         if (ret != EOK) {
@@ -109 +110 @@
                 pret = usbmid_interface_destroy(iface);
                 if (pret != EOK) {
-                        usb_log_error("Failed to remove child for interface "
+                        usb_log_error("Failed to destroy child for interface "
                             "%d (%s): %s\n", iface->interface_no,
                             usb_str_class(iface->interface->interface_class),
@@ -121 +122 @@
 /** Callback when a MID device was removed from the host.
  *
- * @param gen_dev Generic DDF device representing the removed device.
+ * @param dev USB device representing the removed device.
  * @return Error code.
  */
@@ -127 +128 @@
 {
         assert(dev);
+        usb_mid_t *usb_mid = dev->driver_data;
+        assert(usb_mid);
+
         usb_log_info("USB MID gone: `%s'.\n", dev->ddf_dev->name);
 
         /* Remove ctl function */
-        usb_mid_t *usb_mid = dev->driver_data;
         int ret = ddf_fun_unbind(usb_mid->ctl_fun);
         if (ret != EOK) {

uspace/drv/bus/usb/usbmid/usbmid.c

@@ -124 +124 @@
         }
 
-        iface->fun = child;
-
-        child->driver_data = iface;
-        child->ops = &child_device_ops;
-
         rc = usb_device_create_match_ids_from_interface(device_descriptor,
             interface_descriptor, &child->match_ids);
@@ -143 +138 @@
         }
 
+        iface->fun = child;
+        child->driver_data = iface;
+        child->ops = &child_device_ops;
+
         return EOK;
 }