Changes in uspace/drv/bus/usb/usbmid/usbmid.c [87a3df7f:feeac0d] in mainline

File:

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

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

@@ -30 +30 @@
  * @{
  */
+
+/* XXX Fix this */
+#define _DDF_DATA_IMPLANT
 
 /**
@@ -99 +102 @@
     const usb_standard_interface_descriptor_t *interface_descriptor)
 {
+        ddf_fun_t *child = NULL;
         char *child_name = NULL;
         int rc;
@@ -110 +114 @@
             usb_str_class(interface_descriptor->interface_class),
             interface_descriptor->interface_number);
-        if (rc < 0)
+        if (rc < 0) {
                 return ENOMEM;
+        }
 
-        rc = ddf_fun_set_name(iface->fun, child_name);
+        /* Create the device. */
+        child = ddf_fun_create(parent->ddf_dev, fun_inner, child_name);
         free(child_name);
-        if (rc != EOK)
+        if (child == NULL) {
                 return ENOMEM;
+        }
 
         match_id_list_t match_ids;
@@ -123 +130 @@
         rc = usb_device_create_match_ids_from_interface(device_descriptor,
             interface_descriptor, &match_ids);
-        if (rc != EOK)
+        if (rc != EOK) {
+                ddf_fun_destroy(child);
                 return rc;
+        }
 
         list_foreach(match_ids.ids, link, match_id_t, match_id) {
-                rc = ddf_fun_add_match_id(iface->fun, match_id->id, match_id->score);
+                rc = ddf_fun_add_match_id(child, match_id->id, match_id->score);
                 if (rc != EOK) {
                         clean_match_ids(&match_ids);
+                        ddf_fun_destroy(child);
                         return rc;
                 }
@@ -135 +145 @@
         clean_match_ids(&match_ids);
 
-        ddf_fun_set_ops(iface->fun, &child_device_ops);
+        rc = ddf_fun_bind(child);
+        if (rc != EOK) {
+                /* This takes care of match_id deallocation as well. */
+                ddf_fun_destroy(child);
+                return rc;
+        }
 
-        rc = ddf_fun_bind(iface->fun);
-        if (rc != EOK)
-                return rc;
+        iface->fun = child;
+        ddf_fun_data_implant(child, iface);
+        ddf_fun_set_ops(child, &child_device_ops);
 
         return EOK;