diff options
| author | Len Brown <len.brown@intel.com> | 2011-03-23 02:33:54 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2011-03-23 02:33:54 -0400 |
| commit | 5c129a8600100a5d0f5fdbc1014c5dba1d307bc4 (patch) | |
| tree | 9877a14b49cff43d0ba10c12f407ec551c77daa5 /arch/arm/mach-omap2/mailbox.c | |
| parent | 797b10a07069e153d41aedb4ae8e76660279e2ee (diff) | |
| parent | 521cb40b0c44418a4fd36dc633f575813d59a43d (diff) | |
Merge commit 'v2.6.38' into release
Diffstat (limited to 'arch/arm/mach-omap2/mailbox.c')
| -rw-r--r-- | arch/arm/mach-omap2/mailbox.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/arch/arm/mach-omap2/mailbox.c b/arch/arm/mach-omap2/mailbox.c index 0a585dfa9874..24b88504df0f 100644 --- 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, | |||
| 193 | omap_mbox_type_t irq) | 193 | omap_mbox_type_t irq) |
| 194 | { | 194 | { |
| 195 | struct omap_mbox2_priv *p = mbox->priv; | 195 | struct omap_mbox2_priv *p = mbox->priv; |
| 196 | u32 l, bit = (irq == IRQ_TX) ? p->notfull_bit : p->newmsg_bit; | 196 | u32 bit = (irq == IRQ_TX) ? p->notfull_bit : p->newmsg_bit; |
| 197 | l = mbox_read_reg(p->irqdisable); | 197 | |
| 198 | l &= ~bit; | 198 | if (!cpu_is_omap44xx()) |
| 199 | mbox_write_reg(l, p->irqdisable); | 199 | bit = mbox_read_reg(p->irqdisable) & ~bit; |
| 200 | |||
| 201 | mbox_write_reg(bit, p->irqdisable); | ||
| 200 | } | 202 | } |
| 201 | 203 | ||
| 202 | static void omap2_mbox_ack_irq(struct omap_mbox *mbox, | 204 | static void omap2_mbox_ack_irq(struct omap_mbox *mbox, |