Index: uspace/drv/block/ahci/ahci.c
===================================================================
--- uspace/drv/block/ahci/ahci.c	(revision 5ef169038f3c0afb4938a7b77c8772fc6025b1b7)
+++ uspace/drv/block/ahci/ahci.c	(revision eadaeae8dacc68cf558028f23cc96b90a08b7361)
@@ -1184,5 +1184,5 @@
 	ct.ranges = ahci_ranges;
 
-	int irq_cap;
+	cap_irq_handle_t irq_cap;
 	errno_t rc = register_interrupt_handler(dev,
 	    hw_res_parsed.irqs.irqs[0], ahci_interrupt, &ct, &irq_cap);
Index: uspace/drv/block/ddisk/ddisk.c
===================================================================
--- uspace/drv/block/ddisk/ddisk.c	(revision 5ef169038f3c0afb4938a7b77c8772fc6025b1b7)
+++ uspace/drv/block/ddisk/ddisk.c	(revision eadaeae8dacc68cf558028f23cc96b90a08b7361)
@@ -112,5 +112,5 @@
 	ddisk_regs_t *ddisk_regs;
 
-	int irq_cap;
+	cap_irq_handle_t irq_cap;
 
 	bd_srvs_t bds;
@@ -449,5 +449,5 @@
 	ddisk->bds.sarg = ddisk;
 
-	ddisk->irq_cap = -1;
+	ddisk->irq_cap = CAP_NIL;
 
 	/*