Changeset 97c7682 in mainline for uspace/lib/usbvirt/src/ipc_hc.c


Ignore:
Timestamp:
2012-07-14T11:18:40Z (12 years ago)
Author:
Jan Vesely <jano.vesely@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
804d9b6
Parents:
0747468 (diff), f0348c8 (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.

Text conflict in boot/arch/arm32/Makefile.inc:

Trivial conflict around ifeq condition.

Text conflict in kernel/arch/arm32/include/mm/page.h:

Added defines and set_pt_levelx_present function.
COnflict looked horrible because of the armv4/v7 split.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • uspace/lib/usbvirt/src/ipc_hc.c

    r0747468 r97c7682  
    8080        if (rc != EOK) {
    8181                async_exchange_end(exch);
    82                 async_wait_for(opening_request, NULL);
     82                async_forget(opening_request);
    8383                return rc;
    8484        }
    … …  
    9191       
    9292        if (data_request == 0) {
    93                 async_wait_for(opening_request, NULL);
     93                async_forget(opening_request);
    9494                return ENOMEM;
    9595        }
    … …  
    153153        if (rc != EOK) {
    154154                async_exchange_end(exch);
    155                 async_wait_for(opening_request, NULL);
     155                async_forget(opening_request);
    156156                return rc;
    157157        }
    … …  
    161161                if (rc != EOK) {
    162162                        async_exchange_end(exch);
    163                         async_wait_for(opening_request, NULL);
     163                        async_forget(opening_request);
    164164                        return rc;
    165165                }
    … …  
    226226       
    227227        if (data_request == 0) {
    228                 async_wait_for(opening_request, NULL);
     228                async_forget(opening_request);
    229229                return ENOMEM;
    230230        }
    … …  
    301301       
    302302        if (rc != EOK) {
    303                 async_wait_for(opening_request, NULL);
     303                async_forget(opening_request);
    304304                return rc;
    305305        }
Note: See TracChangeset for help on using the changeset viewer.