Fork us on GitHub Follow us on Facebook Follow us on Twitter

Changeset a7d6185 in mainline


Ignore:
Timestamp:
2012-02-18T19:46:20Z (8 years ago)
Author:
Frantisek Princ <frantisek.princ@…>
Branches:
master
Children:
475dc3e
Parents:
5c83612b (diff), f943dd3 (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/infrastructure/root/root.c

    r5c83612b ra7d6185  
    158158        if (asprintf(&match_id, PLATFORM_FUN_MATCH_ID_FMT, platform) == -1) {
    159159                ddf_msg(LVL_ERROR, "Memory allocation failed.");
    160                 return ENOMEM;
    161         }
     160                free(platform);
     161                return ENOMEM;
     162        }
     163
     164        free(platform);
    162165
    163166        /* Add function. */
     
    169172        if (fun == NULL) {
    170173                ddf_msg(LVL_ERROR, "Error creating function %s", name);
     174                free(match_id);
    171175                return ENOMEM;
    172176        }
     
    176180                ddf_msg(LVL_ERROR, "Failed adding match IDs to function %s",
    177181                    name);
     182                free(match_id);
    178183                ddf_fun_destroy(fun);
    179184                return rc;
     
    208213         * vital for the system.
    209214         */
    210         add_virtual_root_fun(dev);
     215        (void) add_virtual_root_fun(dev);
    211216
    212217        /* Register root device's children. */
Note: See TracChangeset for help on using the changeset viewer.