Changeset 6843a9c in mainline for uspace/lib/usbhid/src/hiddescriptor.c

Timestamp:

2012-06-29T13:02:14Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

722912e

Parents:

ba72f2b (diff), 0bbd13e (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

Trivial conflicts.

File:

• uspace/lib/usbhid/src/hiddescriptor.c (modified) (2 diffs)

uspace/lib/usbhid/src/hiddescriptor.c

@@ -135 +135 @@
 int usb_hid_report_init(usb_hid_report_t *report)
 {
-        if(report == NULL) {
+        if (report == NULL) {
                 return EINVAL;
         }
@@ -144 +144 @@
 
         report->use_report_ids = 0;
-    return EOK;   
+    return EOK;
 }