a3802cb2cc3b3605bd2a11dcb76fce3dd4ddb49a
[openwrt/svn-archive/archive.git] / target / linux / omap24xx / patches-3.1 / 254-cbus-retu-tahvo-irq-mask-init-fix.patch
1 Index: linux-3.1.1/drivers/cbus/retu.c
2 ===================================================================
3 --- linux-3.1.1.orig/drivers/cbus/retu.c 2011-11-17 23:09:26.498214061 +0100
4 +++ linux-3.1.1/drivers/cbus/retu.c 2011-11-17 23:15:50.280659655 +0100
5 @@ -451,7 +451,8 @@ static int __devinit retu_probe(struct p
6 (rev >> 4) & 0x07, rev & 0x0f);
7
8 /* Mask all RETU interrupts */
9 - __retu_write_reg(retu, RETU_REG_IMR, 0xffff);
10 + retu->mask = 0xFFFF;
11 + __retu_write_reg(retu, RETU_REG_IMR, retu->mask);
12
13 ret = request_threaded_irq(retu->irq, NULL, retu_irq_handler,
14 IRQF_ONESHOT, "retu", retu);
15 Index: linux-3.1.1/drivers/cbus/tahvo.c
16 ===================================================================
17 --- linux-3.1.1.orig/drivers/cbus/tahvo.c 2011-11-17 23:15:46.684674232 +0100
18 +++ linux-3.1.1/drivers/cbus/tahvo.c 2011-11-17 23:15:50.280659655 +0100
19 @@ -346,7 +346,8 @@ static int __devinit tahvo_probe(struct
20 (rev >> 4) & 0x0f, rev & 0x0f);
21
22 /* Mask all TAHVO interrupts */
23 - __tahvo_write_reg(tahvo, TAHVO_REG_IMR, 0xffff);
24 + tahvo->mask = 0xFFFF;
25 + __tahvo_write_reg(tahvo, TAHVO_REG_IMR, tahvo->mask);
26
27 ret = request_threaded_irq(irq, NULL, tahvo_irq_handler,
28 IRQF_TRIGGER_RISING | IRQF_ONESHOT,