From patchwork Tue Mar 1 00:14:23 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Uribe de Leon, Armando" X-Patchwork-Id: 597811 X-Patchwork-Delegate: tony@atomide.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p1SNv9RL013692 for ; Mon, 28 Feb 2011 23:57:09 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755300Ab1B1X4y (ORCPT ); Mon, 28 Feb 2011 18:56:54 -0500 Received: from comal.ext.ti.com ([198.47.26.152]:54045 "EHLO comal.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755115Ab1B1X4x (ORCPT ); Mon, 28 Feb 2011 18:56:53 -0500 Received: from dlep36.itg.ti.com ([157.170.170.91]) by comal.ext.ti.com (8.13.7/8.13.7) with ESMTP id p1SNukbl027554 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Mon, 28 Feb 2011 17:56:46 -0600 Received: from legion.dal.design.ti.com (localhost [127.0.0.1]) by dlep36.itg.ti.com (8.13.8/8.13.8) with ESMTP id p1SNujAt025462; Mon, 28 Feb 2011 17:56:45 -0600 (CST) Received: from localhost (x0095840-desktop.am.dhcp.ti.com [128.247.77.51]) by legion.dal.design.ti.com (8.11.7p1+Sun/8.11.7) with ESMTP id p1SNujf04484; Mon, 28 Feb 2011 17:56:45 -0600 (CST) From: Armando Uribe To: Armando Uribe , Tony Lindgren , Russell King , , , Cc: Hari Kanigeri , Armando Uribe Subject: [PATCH] omap:mailbox: resolve hang issue Date: Mon, 28 Feb 2011 18:14:23 -0600 Message-Id: <1298938463-15653-1-git-send-email-x0095078@ti.com> X-Mailer: git-send-email 1.6.3.3 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Mon, 28 Feb 2011 23:57:10 +0000 (UTC) diff --git a/arch/arm/mach-omap2/mailbox.c b/arch/arm/mach-omap2/mailbox.c index 3d05ac8..2bfe8c6 100644 --- a/arch/arm/mach-omap2/mailbox.c +++ b/arch/arm/mach-omap2/mailbox.c @@ -207,7 +207,10 @@ static void omap2_mbox_disable_irq(struct omap_mbox *mbox, 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; + if (cpu_is_omap44xx()) + l |= bit; + else + l &= ~bit; mbox_write_reg(l, p->irqdisable); }