Ignore:
Timestamp:
2012-02-09T20:35:12Z (12 years ago)
Author:
Maurizio Lombardi <m.lombardi85@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
591762c6
Parents:
7cede12c (diff), 3d4750f (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 mainline changes

File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/srv/bd/part/guid_part/guid_part.c

    r7cede12c rb7068da  
    164164
    165165        /* Register server with location service. */
    166         rc = loc_server_register(NAME, gpt_connection);
     166        async_set_client_connection(gpt_connection);
     167        rc = loc_server_register(NAME);
    167168        if (rc != EOK) {
    168169                printf(NAME ": Unable to register server.\n");
     
    348349        }
    349350
    350         fs_va = as_get_mappable_page(comm_size);
    351         if (fs_va == NULL) {
     351        (void) async_share_out_finalize(callid, &fs_va);
     352        if (fs_va == (void *) -1) {
    352353                async_answer_0(callid, EHANGUP);
    353354                return;
    354355        }
    355 
    356         (void) async_share_out_finalize(callid, fs_va);
    357356
    358357        while (true) {
Note: See TracChangeset for help on using the changeset viewer.