Changeset 1664a26 in mainline

Timestamp:

2011-12-09T22:40:34Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

266976f

Parents:

89e061d

Message:

uhci: Prefer ddf_dev_data_alloc to plain malloc.

File:

• uspace/drv/bus/usb/uhci/uhci.c (modified) (3 diffs)

uspace/drv/bus/usb/uhci/uhci.c

@@ -148 +148 @@
 int device_setup_uhci(ddf_dev_t *device)
 {
-        assert(device);
-        uhci_t *instance = malloc(sizeof(uhci_t));
+        if (!device)
+                return EBADMEM;
+
+        uhci_t *instance = ddf_dev_data_alloc(device, sizeof(uhci_t));
         if (instance == NULL) {
                 usb_log_error("Failed to allocate OHCI driver.\n");
@@ -158 +160 @@
 if (ret != EOK) { \
         if (instance->hc_fun) \
-                instance->hc_fun->ops = NULL; \
                 instance->hc_fun->driver_data = NULL; \
                 ddf_fun_destroy(instance->hc_fun); \
         if (instance->rh_fun) {\
-                instance->rh_fun->ops = NULL; \
                 instance->rh_fun->driver_data = NULL; \
                 ddf_fun_destroy(instance->rh_fun); \
         } \
-        device->driver_data = NULL; \
         usb_log_error(message); \
         return ret; \
@@ -227 +226 @@
             "Failed to init uhci_hcd: %s.\n", str_error(ret));
 
-        device->driver_data = instance;
-
 #define CHECK_RET_FINI_RETURN(ret, message...) \
 if (ret != EOK) { \