Changeset a23297c in mainline


Ignore:
Timestamp:
2011-10-04T12:19:35Z (12 years ago)
Author:
Frantisek Princ <frantisek.princ@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
cfa1a8a
Parents:
9c0c0e1 (diff), 3d79f5b (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:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/drv/bus/usb/usbmast/main.c

    r9c0c0e1 ra23297c  
    9494
    9595        /* Allocate softstate */
    96         mdev = calloc(1, sizeof(usbmast_dev_t));
     96        mdev = ddf_dev_data_alloc(dev->ddf_dev, sizeof(usbmast_dev_t));
    9797        if (mdev == NULL) {
    9898                usb_log_error("Failed allocating softstate.\n");
     
    159159
    160160        /* Allocate soft state */
    161         mfun = ddf_dev_data_alloc(mdev->ddf_dev, sizeof(usbmast_fun_t));
     161        mfun = ddf_fun_data_alloc(fun, sizeof(usbmast_fun_t));
    162162        if (mfun == NULL) {
    163163                usb_log_error("Failed allocating softstate.\n");
     
    171171        /* Set up a connection handler. */
    172172        fun->conn_handler = usbmast_bd_connection;
    173         fun->driver_data = mfun;
    174173
    175174        usb_log_debug("Inquire...\n");
Note: See TracChangeset for help on using the changeset viewer.