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

Timestamp:

2016-09-01T16:46:27Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

2a2fbc8

Parents:

9befb0d (diff), bdfdc51c (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 mainline.

File:

• uspace/lib/usbdev/src/pipesinit.c (modified) (1 diff)

uspace/lib/usbdev/src/pipesinit.c

@@ -286 +286 @@
     usb_dev_session_t *bus_session)
 {
-
-        if (config_descriptor == NULL) {
+        if (config_descriptor == NULL)
                 return EBADMEM;
-        }
-        if (config_descriptor_size
-            < sizeof(usb_standard_configuration_descriptor_t)) {
+        
+        if (config_descriptor_size <
+            sizeof(usb_standard_configuration_descriptor_t)) {
                 return ERANGE;
         }