Changeset 72af8da in mainline for uspace/lib/usb/src/pipesio.c

Timestamp:

2011-03-16T18:50:17Z (13 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

42a3a57

Parents:

3e7b7cd (diff), fcf07e6 (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 from usb/development

File:

• uspace/lib/usb/src/pipesio.c (modified) (2 diffs)

uspace/lib/usb/src/pipesio.c

@@ -115 +115 @@
 
         if (data_request_rc != EOK) {
-                return (int) data_request_rc;
+                /* Prefer the return code of the opening request. */
+                if (opening_request_rc != EOK) {
+                        return (int) opening_request_rc;
+                } else {
+                        return (int) data_request_rc;
+                }
         }
         if (opening_request_rc != EOK) {
@@ -331 +336 @@
 
         if (data_request_rc != EOK) {
-                return (int) data_request_rc;
+                /* Prefer the return code of the opening request. */
+                if (opening_request_rc != EOK) {
+                        return (int) opening_request_rc;
+                } else {
+                        return (int) data_request_rc;
+                }
         }
         if (opening_request_rc != EOK) {