Changeset 97c7682 in mainline for uspace/lib/usbhid/src/hidiface.c

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:

• uspace/lib/usbhid/src/hidiface.c (modified) (3 diffs)

uspace/lib/usbhid/src/hidiface.c

@@ -33 +33 @@
  * Client functions for accessing USB HID interface (implementation).
  */
+
 #include <dev_iface.h>
 #include <usbhid_iface.h>
@@ -120 +121 @@
         
         if (data_request == 0) {
-                async_wait_for(opening_request, NULL);
+                async_forget(opening_request);
                 free(buffer);
                 return ENOMEM;
@@ -206 +207 @@
         
         if (data_request == 0) {
-                async_wait_for(opening_request, NULL);
+                async_forget(opening_request);
                 return ENOMEM;
         }