Changeset 4c53333 in mainline for uspace/lib/usbhid/src/hidiface.c

Timestamp:

2013-07-11T08:21:10Z (12 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

64e63ce1

Parents:

80445cf (diff), c8bb1633 (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:

• uspace/lib/usbhid/src/hidiface.c (modified) (5 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>
@@ -89 +90 @@
                 return EINVAL;
         
-        if ((buf == NULL))
+        if (buf == NULL)
                 return ENOMEM;
         
@@ -120 +121 @@
         
         if (data_request == 0) {
-                async_wait_for(opening_request, NULL);
+                async_forget(opening_request);
                 free(buffer);
                 return ENOMEM;
@@ -183 +184 @@
                 return EINVAL;
         
-        if ((buf == NULL))
+        if (buf == NULL)
                 return ENOMEM;
         
@@ -206 +207 @@
         
         if (data_request == 0) {
-                async_wait_for(opening_request, NULL);
+                async_forget(opening_request);
                 return ENOMEM;
         }