Changeset 615abda in mainline for uspace/drv/bus/usb/ehci/main.c

Timestamp:

2014-01-19T01:34:03Z (10 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

4ee5272

Parents:

c9e954c

Message:

ehci: plug legacy disabling code

Remove CHECK_RET macro

File:

• uspace/drv/bus/usb/ehci/main.c (modified) (2 diffs)

uspace/drv/bus/usb/ehci/main.c

@@ -96 +96 @@
         assert(device);
 
-        const int ret = ddf_hcd_device_setup_all(device, USB_SPEED_HIGH,
+        int ret = disable_legacy(device);
+        if (ret != EOK) {
+                usb_log_error("Failed to disable EHCI legacy support: %s\n",
+                    str_error(ret));
+                return ret;
+        }
+
+        ret = ddf_hcd_device_setup_all(device, USB_SPEED_HIGH,
             BANDWIDTH_AVAILABLE_USB20, bandwidth_count_usb11,
             ddf_hcd_gen_irq_handler, ehci_hc_gen_irq_code,
@@ -103 +110 @@
                 usb_log_error("Failed to initialize EHCI driver: %s.\n",
                     str_error(ret));
+                return ret;
         }
         usb_log_info("Controlling new EHCI device '%s'.\n",