Index: uspace/drv/bus/usb/ohci/hc.c
===================================================================
--- uspace/drv/bus/usb/ohci/hc.c	(revision 620c710af8ea806f074c8dc9ea391400b6b82226)
+++ uspace/drv/bus/usb/ohci/hc.c	(revision 961c29e89ffe340db91ba1cf4653315003b53f92)
@@ -133,5 +133,6 @@
 
 	const usb_address_t hub_address =
-	    device_keeper_get_free_address(&instance->manager, USB_SPEED_FULL);
+	    device_keeper_get_free_address(
+	        &instance->generic.dev_manager, USB_SPEED_FULL);
 	if (hub_address <= 0) {
 		usb_log_error("Failed to get OHCI root hub address: %s\n",
@@ -141,5 +142,5 @@
 	instance->rh.address = hub_address;
 	usb_device_keeper_bind(
-	    &instance->manager, hub_address, hub_fun->handle);
+	    &instance->generic.dev_manager, hub_address, hub_fun->handle);
 
 #define CHECK_RET_RELEASE(ret, message...) \
@@ -200,4 +201,6 @@
 
 	ret = hcd_init(&instance->generic, BANDWIDTH_AVAILABLE_USB11);
+	CHECK_RET_RETURN(ret, "Failed to initialize endpoint manager: %s.\n",
+	    str_error(ret));
 	instance->generic.private_data = instance;
 	instance->generic.schedule = schedule;
Index: uspace/drv/bus/usb/ohci/ohci.c
===================================================================
--- uspace/drv/bus/usb/ohci/ohci.c	(revision 620c710af8ea806f074c8dc9ea391400b6b82226)
+++ uspace/drv/bus/usb/ohci/ohci.c	(revision 961c29e89ffe340db91ba1cf4653315003b53f92)
@@ -89,5 +89,6 @@
 {
 	assert(fun);
-	usb_device_keeper_t *manager = &dev_to_ohci(fun->dev)->hc.generic.dev_manager;
+	usb_device_keeper_t *manager =
+	    &dev_to_ohci(fun->dev)->hc.generic.dev_manager;
 
 	usb_address_t addr = usb_device_keeper_find(manager, handle);