Skip to contentSkip to conversation

cbus: Fix initialization of cached IRQ masks

PATCH In review Michael Büsch 3 participants 3 messages Nov 18, 2011 – Nov 19, 2011

lore
Share & tools
lore

Michael Büsch

author
#0 lore raw

PATCH v2 1/1 cbus: Fix initialization of cached IRQ masks

This fixes the initialization of retu/tahvo cached IRQ masks.

Signed-off-by Michael Buesch <[email protected]>

---

v2: lowercase

drivers/cbus/retu.c +2 -1
Index: linux-3.1.1/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);
drivers/cbus/tahvo.c +2 -1
Index: linux-3.1.1/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,
Signature · 1 line
Greetings, Michael.
Reviewed-by on v2 1/1
#1 lore raw
Quoted 3 lines · Michael Büsch

This fixes the initialization of retu/tahvo cached IRQ masks.

Signed-off-by Michael Buesch <[email protected]>
Reviewed-by Felipe Balbi <[email protected]>
Quoted 36 lines

---

v2: lowercase

Index: linux-3.1.1/drivers/cbus/retu.c
===================================================================

drivers/cbus/retu.c +2 -1
@@ -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);

Index: linux-3.1.1/drivers/cbus/tahvo.c
===================================================================

drivers/cbus/tahvo.c +2 -1
@@ -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,
Signature · 2 lines
-- 
Greetings, Michael.
Signature · 1 line
balbi