Changeset 1114173 in mainline


Ignore:
Timestamp:
2011-10-06T09:49:39Z (12 years ago)
Author:
Frantisek Princ <frantisek.princ@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
e68c834
Parents:
9b9d37bb (diff), d6c953e9 (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

    r9b9d37bb r1114173  
    9797        if (mdev == NULL) {
    9898                usb_log_error("Failed allocating softstate.\n");
    99                 rc = ENOMEM;
    100                 goto error;
     99                return ENOMEM;
    101100        }
    102101
     
    125124error:
    126125        /* XXX Destroy functions */
    127         if (mdev != NULL)
    128                 free(mdev);
    129126        return rc;
    130127}
Note: See TracChangeset for help on using the changeset viewer.