From 639f167d35701fbfcafc24052bda55b376009a0d Mon Sep 17 00:00:00 2001 From: Tony Lindgren Date: Thu, 3 Mar 2011 10:25:18 -0800 Subject: [PATCH] --- yaml --- r: 233953 b: refs/heads/master c: 077f8ec889bb1eb26a7128fdbc75922755ed2320 h: refs/heads/master i: 233951: bd137cefa602e7b12514f3d7a63b39ce41b6df66 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-omap2/mailbox.c | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index de446f399a9c..dd48d394801a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b3329a33b5a3902e65c5517f41c374f5adb060e1 +refs/heads/master: 077f8ec889bb1eb26a7128fdbc75922755ed2320 diff --git a/trunk/arch/arm/mach-omap2/mailbox.c b/trunk/arch/arm/mach-omap2/mailbox.c index 0a585dfa9874..24b88504df0f 100644 --- a/trunk/arch/arm/mach-omap2/mailbox.c +++ b/trunk/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,