Index: uspace/drv/bus/usb/ehci/ehci.c
===================================================================
--- uspace/drv/bus/usb/ehci/ehci.c	(revision ba4a03a5128c12a813b86aec7796e57c21dffead)
+++ uspace/drv/bus/usb/ehci/ehci.c	(revision d1df3818a95cee3c47bd9d726fdc58f9a8df71bc)
@@ -95,5 +95,4 @@
 	}
 	addr_range_t regs = hw_res.mem_ranges.ranges[0];
-	const int irq = hw_res.irqs.irqs[0];
 
 	/* Initialize generic HCD driver */
@@ -117,9 +116,9 @@
 	/* Try to enable interrupts */
 	bool interrupts = false;
-	ret = hcd_ddf_setup_interrupts(device, &hw_res, irq_handler,
+	const int irq = hcd_ddf_setup_interrupts(device, &hw_res, irq_handler,
 	    hc_gen_irq_code);
-	if (ret != EOK) {
+	if (irq < 0) {
 		usb_log_warning("Failed to enable interrupts: %s."
-		    " Falling back to polling\n", str_error(ret));
+		    " Falling back to polling\n", str_error(irq));
 	} else {
 		usb_log_debug("Hw interrupts enabled.\n");
Index: uspace/drv/bus/usb/ohci/ohci.c
===================================================================
--- uspace/drv/bus/usb/ohci/ohci.c	(revision ba4a03a5128c12a813b86aec7796e57c21dffead)
+++ uspace/drv/bus/usb/ohci/ohci.c	(revision d1df3818a95cee3c47bd9d726fdc58f9a8df71bc)
@@ -95,5 +95,4 @@
 	}
 	addr_range_t regs = hw_res.mem_ranges.ranges[0];
-	const int irq = hw_res.irqs.irqs[0];
 
 	/* Initialize generic HCD driver */
@@ -117,9 +116,9 @@
 	/* Try to enable interrupts */
 	bool interrupts = false;
-	ret = hcd_ddf_setup_interrupts(device, &hw_res, irq_handler,
+	const int irq = hcd_ddf_setup_interrupts(device, &hw_res, irq_handler,
 	    hc_gen_irq_code);
-	if (ret != EOK) {
+	if (irq < 0) {
 		usb_log_warning("Failed to enable interrupts: %s."
-		    " Falling back to polling\n", str_error(ret));
+		    " Falling back to polling\n", str_error(irq));
 	} else {
 		usb_log_debug("Hw interrupts enabled.\n");
Index: uspace/drv/bus/usb/uhci/uhci.c
===================================================================
--- uspace/drv/bus/usb/uhci/uhci.c	(revision ba4a03a5128c12a813b86aec7796e57c21dffead)
+++ uspace/drv/bus/usb/uhci/uhci.c	(revision d1df3818a95cee3c47bd9d726fdc58f9a8df71bc)
@@ -97,5 +97,4 @@
 	}
 	addr_range_t regs = hw_res.io_ranges.ranges[0];
-	const int irq = hw_res.irqs.irqs[0];
 
 	ret = hcd_ddf_setup_hc(device, USB_SPEED_FULL,
@@ -116,9 +115,9 @@
 
 	bool interrupts = false;
-	ret = hcd_ddf_setup_interrupts(device, &hw_res, irq_handler,
+	const int irq = hcd_ddf_setup_interrupts(device, &hw_res, irq_handler,
 	    hc_gen_irq_code);
-	if (ret != EOK) {
+	if (irq < 0) {
 		usb_log_warning("Failed to enable interrupts: %s."
-		    " Falling back to polling.\n", str_error(ret));
+		    " Falling back to polling.\n", str_error(irq));
 	} else {
 		usb_log_debug("Hw interrupts enabled.\n");