Changeset 6843a9c in mainline for uspace/lib/usbhid/src/hidreq.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/hidreq.c (modified) (1 diff)

uspace/lib/usbhid/src/hidreq.c

@@ -84 +84 @@
         usb_log_debug("Sending Set Report request to the device.\n");
         
-        rc = usb_control_request_set(ctrl_pipe, 
-            USB_REQUEST_TYPE_CLASS, USB_REQUEST_RECIPIENT_INTERFACE, 
+        rc = usb_control_request_set(ctrl_pipe,
+            USB_REQUEST_TYPE_CLASS, USB_REQUEST_RECIPIENT_INTERFACE,
             USB_HIDREQ_SET_REPORT, value, iface_no, buffer, buf_size);
 
         if (rc != EOK) {
-                usb_log_warning("Error sending Set Report request to the "
+                usb_log_error("Error sending Set Report request to the "
                     "device: %s.\n", str_error(rc));
                 return rc;