Changeset 20a3465 in mainline for uspace/lib/usbdev/src/request.c

Timestamp:

2011-10-30T19:50:54Z (14 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

3ce78580, 48902fa

Parents:

4c3ad56 (diff), 45bf63c (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/usbdev/src/request.c (modified) (2 diffs)

uspace/lib/usbdev/src/request.c

@@ -425 +425 @@
 
         /* Everything is okay, copy the descriptor. */
-        memcpy(descriptor, &descriptor_tmp,
-            sizeof(descriptor_tmp));
+        memcpy(descriptor, &descriptor_tmp, sizeof(descriptor_tmp));
 
         return EOK;
@@ -470 +469 @@
 
         /* Everything is okay, copy the descriptor. */
-        memcpy(descriptor, &descriptor_tmp,
-            sizeof(descriptor_tmp));
+        memcpy(descriptor, &descriptor_tmp, sizeof(descriptor_tmp));
 
         return EOK;