Changeset 97c7682 in mainline for uspace/lib/drv/generic/remote_usbhc.c

Timestamp:

2012-07-14T11:18:40Z (13 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:

• uspace/lib/drv/generic/remote_usbhc.c (modified) (2 diffs)

uspace/lib/drv/generic/remote_usbhc.c

@@ -259 +259 @@
         if (data_request == 0) {
                 // FIXME: How to let the other side know that we want to abort?
-                async_wait_for(opening_request, NULL);
+                async_forget(opening_request);
                 return ENOMEM;
         }
@@ -308 +308 @@
                 const int ret = async_data_write_start(exch, data, size);
                 if (ret != EOK) {
-                        async_wait_for(opening_request, NULL);
+                        async_forget(opening_request);
                         return ret;
                 }