[PATCH v2] cbus: Fix initialization of cached IRQ masks

[PATCH v2] cbus: Fix initialization of cached IRQ masks

[Michael Büsch]

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

Signed-off-by: Michael Buesch <m@bues.ch>

---

v2: lowercase

Index: linux-3.1.1/drivers/cbus/retu.c
===================================================================
--- linux-3.1.1.orig/drivers/cbus/retu.c	2011-11-17 23:09:26.498214061 +0100
+++ linux-3.1.1/drivers/cbus/retu.c	2011-11-17 23:15:50.280659655 +0100
@@ -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
===================================================================
--- linux-3.1.1.orig/drivers/cbus/tahvo.c	2011-11-17 23:15:46.684674232 +0100
+++ linux-3.1.1/drivers/cbus/tahvo.c	2011-11-17 23:15:50.280659655 +0100
@@ -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,

-- 
Greetings, Michael.

Re: [PATCH v2] cbus: Fix initialization of cached IRQ masks

[Felipe Balbi]

[-- Attachment #1: Type: text/plain, Size: 1625 bytes --]

On Fri, Nov 18, 2011 at 11:31:32AM +0100, Michael Büsch wrote:
> This fixes the initialization of retu/tahvo cached IRQ masks.
> 
> Signed-off-by: Michael Buesch <m@bues.ch>

Reviewed-by: Felipe Balbi <balbi@ti.com>

> 
> ---
> 
> v2: lowercase
> 
> Index: linux-3.1.1/drivers/cbus/retu.c
> ===================================================================
> --- linux-3.1.1.orig/drivers/cbus/retu.c	2011-11-17 23:09:26.498214061 +0100
> +++ linux-3.1.1/drivers/cbus/retu.c	2011-11-17 23:15:50.280659655 +0100
> @@ -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
> ===================================================================
> --- linux-3.1.1.orig/drivers/cbus/tahvo.c	2011-11-17 23:15:46.684674232 +0100
> +++ linux-3.1.1/drivers/cbus/tahvo.c	2011-11-17 23:15:50.280659655 +0100
> @@ -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,
> 
> -- 
> Greetings, Michael.

-- 
balbi

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

Re: [PATCH v2] cbus: Fix initialization of cached IRQ masks

[Tony Lindgren]

* Felipe Balbi <balbi@ti.com> [111118 04:59]:
> On Fri, Nov 18, 2011 at 11:31:32AM +0100, Michael Büsch wrote:
> > This fixes the initialization of retu/tahvo cached IRQ masks.
> > 
> > Signed-off-by: Michael Buesch <m@bues.ch>
> 
> Reviewed-by: Felipe Balbi <balbi@ti.com>

Thanks applying all three into cbus.

Tony
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html