Changeset 361e61b in mainline for uspace/drv/usbhid/hiddev.c

Timestamp:

2011-03-21T14:23:15Z (13 years ago)

Author:

Matej Klonfar <maklf@…>

Branches:

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

Children:

55e388a1

Parents:

c32688d (diff), 48fe0c9 (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 with development

File:

• uspace/drv/usbhid/hiddev.c (modified) (2 diffs)

uspace/drv/usbhid/hiddev.c

@@ -411 +411 @@
                 return rc;
         }
-        
+        rc = usb_endpoint_pipe_probe_default_control(&hid_dev->ctrl_pipe);
+        if (rc != EOK) {
+                usb_log_error("Probing default control pipe failed: %s.\n",
+                    str_error(rc));
+                return rc;
+        }
+
         /*
          * Initialize the report parser.
@@ -434 +440 @@
         if (rc != EOK) {
                 /* TODO: end session?? */
+                usb_endpoint_pipe_end_session(&hid_dev->ctrl_pipe);
                 usb_log_error("Failed to process descriptors: %s.\n",
                     str_error(rc));