Changes in uspace/drv/bus/usb/ohci/ohci.c [27ed734c:9c986d3] in mainline

File:

• uspace/drv/bus/usb/ohci/ohci.c (modified) (2 diffs)

uspace/drv/bus/usb/ohci/ohci.c

@@ -140 +140 @@
 int device_setup_ohci(ddf_dev_t *device)
 {
-        assert(device);
-
-        ohci_t *instance = malloc(sizeof(ohci_t));
+        if (device == NULL)
+                return EBADMEM;
+
+        ohci_t *instance = ddf_dev_data_alloc(device,sizeof(ohci_t));
         if (instance == NULL) {
                 usb_log_error("Failed to allocate OHCI driver.\n");
                 return ENOMEM;
         }
-        instance->rh_fun = NULL;
-        instance->hc_fun = NULL;
 
 #define CHECK_RET_DEST_FREE_RETURN(ret, message...) \
 if (ret != EOK) { \
         if (instance->hc_fun) { \
+                instance->hc_fun->driver_data = NULL; \
                 ddf_fun_destroy(instance->hc_fun); \
         } \
         if (instance->rh_fun) { \
+                instance->rh_fun->driver_data = NULL; \
                 ddf_fun_destroy(instance->rh_fun); \
         } \
-        free(instance); \
         usb_log_error(message); \
         return ret; \
@@ -219 +219 @@
             "Failed to init ohci_hcd: %s.\n", str_error(ret));
 
-        device->driver_data = instance;
-
 #define CHECK_RET_FINI_RETURN(ret, message...) \
 if (ret != EOK) { \