git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 2:
b3329a3
)
Merge branch 'for_2.6.38/pm-fixes' of ssh://master.kernel.org/pub/scm/linux/kernel...
author
Tony Lindgren
<tony@atomide.com>
Thu, 3 Mar 2011 18:25:18 +0000
(10:25 -0800)
committer
Tony Lindgren
<tony@atomide.com>
Thu, 3 Mar 2011 18:25:18 +0000
(10:25 -0800)
arch/arm/mach-omap2/mailbox.c
patch
|
blob
|
history
diff --git
a/arch/arm/mach-omap2/mailbox.c
b/arch/arm/mach-omap2/mailbox.c
index
0a585df
..
24b8850
100644
(file)
--- a/
arch/arm/mach-omap2/mailbox.c
+++ b/
arch/arm/mach-omap2/mailbox.c
@@
-193,10
+193,12
@@
static void omap2_mbox_disable_irq(struct omap_mbox *mbox,
omap_mbox_type_t irq)
{
struct omap_mbox2_priv *p = mbox->priv;
- u32 l, bit = (irq == IRQ_TX) ? p->notfull_bit : p->newmsg_bit;
- l = mbox_read_reg(p->irqdisable);
- l &= ~bit;
- mbox_write_reg(l, p->irqdisable);
+ u32 bit = (irq == IRQ_TX) ? p->notfull_bit : p->newmsg_bit;
+
+ if (!cpu_is_omap44xx())
+ bit = mbox_read_reg(p->irqdisable) & ~bit;
+
+ mbox_write_reg(bit, p->irqdisable);
}
static void omap2_mbox_ack_irq(struct omap_mbox *mbox,