Changeset 17aca1c in mainline for uspace/drv/usbhid/main.c


Ignore:
Timestamp:
2011-02-04T20:56:52Z (13 years ago)
Author:
Vojtech Horky <vojtechhorky@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
0397e5a4, e29e09cf
Parents:
e778543 (diff), 0b37882 (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/drv/usbhid/main.c

    re778543 r17aca1c  
    8383
    8484                if (console_callback_phone != -1) {
    85                         ipc_answer_0(icallid, ELIMIT);
     85                        async_answer_0(icallid, ELIMIT);
    8686                        return;
    8787                }
    8888
    8989                console_callback_phone = callback;
    90                 ipc_answer_0(icallid, EOK);
     90                async_answer_0(icallid, EOK);
    9191                return;
    9292        }
    9393
    94         ipc_answer_0(icallid, EINVAL);
     94        async_answer_0(icallid, EINVAL);
    9595}
    9696
Note: See TracChangeset for help on using the changeset viewer.