--- a/drivers/cbus/retu.c
+++ b/drivers/cbus/retu.c
@@ -451,7 +451,8 @@ static int __devinit retu_probe(struct p
 			(rev >> 4) & 0x07, rev & 0x0f);
 
 	/* Mask all RETU interrupts */
-	__retu_write_reg(retu, RETU_REG_IMR, 0xffff);
+	retu->mask = 0xFFFF;
+	__retu_write_reg(retu, RETU_REG_IMR, retu->mask);
 
 	ret = request_threaded_irq(retu->irq, NULL, retu_irq_handler,
 			IRQF_ONESHOT, "retu", retu);
--- a/drivers/cbus/tahvo.c
+++ b/drivers/cbus/tahvo.c
@@ -346,7 +346,8 @@ static int __devinit tahvo_probe(struct
 			(rev >> 4) & 0x0f, rev & 0x0f);
 
 	/* Mask all TAHVO interrupts */
-	__tahvo_write_reg(tahvo, TAHVO_REG_IMR, 0xffff);
+	tahvo->mask = 0xFFFF;
+	__tahvo_write_reg(tahvo, TAHVO_REG_IMR, tahvo->mask);
 
 	ret = request_threaded_irq(irq, NULL, tahvo_irq_handler,
 			IRQF_TRIGGER_RISING | IRQF_ONESHOT,