Changeset 9c986d3 in mainline

Timestamp:

2011-12-09T22:08:25Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

8f5b4d44

Parents:

89128f3

Message:

ohci: Use ddf_dev_data_alloc instead of plain malloc.

Fix possible free failure (fun→driver_data).

Location:

uspace/drv/bus/usb/ohci

Files:

• hc.c (modified) (1 diff)
• ohci.c (modified) (2 diffs)

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

@@ -148 +148 @@
         return ret; \
 } else (void)0
+
         ret = usb_endpoint_manager_add_ep(
             &instance->generic.ep_manager, instance->rh.address, 0,

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) { \