Changeset 400735e in mainline for uspace/drv/ohci/hc.c

Timestamp:

2011-05-28T14:30:58Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

3fb5a3e

Parents:

e8f826b (diff), 48141f0 (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 development/ changes

File:

• uspace/drv/ohci/hc.c (modified) (2 diffs)

uspace/drv/ohci/hc.c

@@ -343 +343 @@
 {
         assert(instance);
-        usb_log_debug("OHCI(%p) interrupt: %x.\n", instance, status);
         if ((status & ~I_SF) == 0) /* ignore sof status */
                 return;
+        usb_log_debug2("OHCI(%p) interrupt: %x.\n", instance, status);
         if (status & I_RHSC)
                 rh_interrupt(&instance->rh);
@@ -565 +565 @@
         bzero(&instance->rh, sizeof(instance->rh));
         /* Init queues */
-        hc_init_transfer_lists(instance);
+        const int ret = hc_init_transfer_lists(instance);
+        if (ret != EOK) {
+                return ret;
+        }
 
         /*Init HCCA */