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