Changeset 64ce0c1 in mainline for uspace/lib/usbdev/src/pipesinit.c

Timestamp:

2018-02-02T10:13:55Z (6 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

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

Children:

961a5ee

Parents:

e67c50a (diff), 290338b (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 commit '290338bf7224f502808b23e82d98306208962b97' into forwardport

File:

• uspace/lib/usbdev/src/pipesinit.c (modified) (2 diffs)

uspace/lib/usbdev/src/pipesinit.c

@@ -146 +146 @@
                 if (interface_number_fits
                     && interface_setting_fits
-                    && endpoint_descriptions_fits) {
+                    && endpoint_descriptions_fits
+                    && !mapping->present) {
                         return mapping;
                 }
@@ -153 +154 @@
                 mapping_count--;
         }
+
         return NULL;
 }