Changeset 25696fea in mainline for uspace/drv/bus/usb/usbmid/usbmid.c

Timestamp:

2011-10-15T20:05:00Z (13 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

22ceff3a

Parents:

1ccc32f (diff), 721d4b6e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge with mainline

File:

• uspace/drv/bus/usb/usbmid/usbmid.c (modified) (5 diffs)

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

@@ -45 +45 @@
 
 /** Callback for DDF USB interface. */
-static int usb_iface_get_address_impl(ddf_fun_t *fun, devman_handle_t handle,
-    usb_address_t *address)
-{
-        return usb_iface_get_address_hub_impl(fun, handle, address);
-}
-
-/** Callback for DDF USB interface. */
 static int usb_iface_get_interface_impl(ddf_fun_t *fun, devman_handle_t handle,
     int *iface_no)
@@ -70 +63 @@
 static usb_iface_t child_usb_iface = {
         .get_hc_handle = usb_iface_get_hc_handle_hub_child_impl,
-        .get_address = usb_iface_get_address_impl,
+        .get_address = usb_iface_get_address_hub_impl,
         .get_interface = usb_iface_get_interface_impl
 };
@@ -79 +72 @@
 };
 
+int usbmid_interface_destroy(usbmid_interface_t *mid_iface)
+{
+        assert(mid_iface);
+        assert_link_not_used(&mid_iface->link);
+        const int ret = ddf_fun_unbind(mid_iface->fun);
+        if (ret != EOK) {
+                return ret;
+        }
+        /* NOTE: usbmid->interface points somewhere, but we did not
+         * allocate that space, so don't touch */
+        ddf_fun_destroy(mid_iface->fun);
+        /* NOTE: mid_iface is invalid at this point, it was assigned to
+         * mid_iface->fun->driver_data and freed in ddf_fun_destroy */
+        return EOK;
+}
 
 /** Spawn new child device from one interface.
@@ -106 +114 @@
             (int) interface_descriptor->interface_number);
         if (rc < 0) {
-                goto error_leave;
+                return ENOMEM;
         }
 
         /* Create the device. */
         child = ddf_fun_create(parent->ddf_dev, fun_inner, child_name);
+        free(child_name);
         if (child == NULL) {
-                rc = ENOMEM;
-                goto error_leave;
+                return ENOMEM;
         }
 
@@ -122 +130 @@
 
         rc = usb_device_create_match_ids_from_interface(device_descriptor,
-            interface_descriptor,
-            &child->match_ids);
+            interface_descriptor, &child->match_ids);
         if (rc != EOK) {
-                goto error_leave;
+                ddf_fun_destroy(child);
+                return rc;
         }
 
         rc = ddf_fun_bind(child);
         if (rc != EOK) {
-                goto error_leave;
+                /* This takes care of match_id deallocation as well. */
+                ddf_fun_destroy(child);
+                return rc;
         }
 
         return EOK;
-
-error_leave:
-        if (child != NULL) {
-                child->name = NULL;
-                /* This takes care of match_id deallocation as well. */
-                ddf_fun_destroy(child);
-        }
-        if (child_name != NULL) {
-                free(child_name);
-        }
-
-        return rc;
 }