Ignore:
Timestamp:
2012-10-18T22:38:27Z (13 years ago)
Author:
Maurizio Lombardi <m.lombardi85@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
508fff8
Parents:
b801f2d (diff), 7d248e3 (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
  • kernel/generic/src/ipc/ops/clnestab.c

    rb801f2d r5c90e3e  
    4545}
    4646
    47 static void answer_cleanup(call_t *answer, ipc_data_t *olddata)
     47static int answer_cleanup(call_t *answer, ipc_data_t *olddata)
    4848{
    4949        phone_t *phone = (phone_t *) IPC_GET_ARG5(*olddata);
     
    5757        }
    5858        mutex_unlock(&phone->lock);
     59
     60        return EOK;
    5961}
    6062
Note: See TracChangeset for help on using the changeset viewer.