From patchwork Thu Feb 18 21:07:30 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Suman Anna <s-anna@ti.com>
X-Patchwork-Id: 80439
X-Patchwork-Delegate: tony@atomide.com
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o1IL7YCD025683
	for <patchwork-omap@patchwork.kernel.org>;
	Thu, 18 Feb 2010 21:07:36 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1753656Ab0BRVHg (ORCPT
	<rfc822;patchwork-omap@patchwork.kernel.org>);
	Thu, 18 Feb 2010 16:07:36 -0500
Received: from arroyo.ext.ti.com ([192.94.94.40]:45705 "EHLO
	arroyo.ext.ti.com"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1753616Ab0BRVHf convert rfc822-to-8bit (ORCPT
	<rfc822; linux-omap@vger.kernel.org>); Thu, 18 Feb 2010 16:07:35 -0500
Received: from dlep36.itg.ti.com ([157.170.170.91])
	by arroyo.ext.ti.com (8.13.7/8.13.7) with ESMTP id o1IL7VJG016313
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO);
	Thu, 18 Feb 2010 15:07:31 -0600
Received: from dlep26.itg.ti.com (localhost [127.0.0.1])
	by dlep36.itg.ti.com (8.13.8/8.13.8) with ESMTP id o1IL7Vxk005491;
	Thu, 18 Feb 2010 15:07:31 -0600 (CST)
Received: from dlee73.ent.ti.com (localhost [127.0.0.1])
	by dlep26.itg.ti.com (8.13.8/8.13.8) with ESMTP id o1IL7Vp7004315;
	Thu, 18 Feb 2010 15:07:31 -0600 (CST)
Received: from dlee04.ent.ti.com ([157.170.170.9]) by dlee73.ent.ti.com
	([157.170.170.88]) with mapi; Thu, 18 Feb 2010 15:07:31 -0600
From: "Anna, Suman" <s-anna@ti.com>
To: "linux-omap@vger.kernel.org" <linux-omap@vger.kernel.org>
CC: "Hiroshi.DOYU@nokia.com" <Hiroshi.DOYU@nokia.com>,
	"Clark, Rob" <rob@ti.com>, "Kanigeri, Hari" <h-kanigeri2@ti.com>,
	"C.A, Subramaniam" <subramaniam.ca@ti.com>
Date: Thu, 18 Feb 2010 15:07:30 -0600
Subject: [PATCH 5/5] omap2/3/4: mailbox: retries in case of FIFO full
Thread-Topic: [PATCH 5/5] omap2/3/4: mailbox: retries in case of FIFO full
Thread-Index: Acqw3mGcDd0HVYOCSSuhqTnEWeVnTg==
Message-ID: <2C1563023E232C49B9F505633D57C2DA2640D02360@dlee04.ent.ti.com>
Accept-Language: en-US
Content-Language: en-US
X-MS-Has-Attach: 
X-MS-TNEF-Correlator: 
acceptlanguage: en-US
MIME-Version: 1.0
Sender: linux-omap-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-omap.vger.kernel.org>
X-Mailing-List: linux-omap@vger.kernel.org
X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by
	milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]);
	Thu, 18 Feb 2010 21:07:36 +0000 (UTC)


diff --git a/arch/arm/plat-omap/mailbox.c b/arch/arm/plat-omap/mailbox.c
index 4229cec..8795f18 100644
--- a/arch/arm/plat-omap/mailbox.c
+++ b/arch/arm/plat-omap/mailbox.c
@@ -71,10 +71,10 @@ static int __mbox_msg_send(struct omap_mbox *mbox, mbox_msg_t msg)
 	int ret = 0, i = 1000;
 
 	while (mbox_fifo_full(mbox)) {
-		if (mbox->ops->type == OMAP_MBOX_TYPE2)
-			return -1;
-		if (--i == 0)
+		if (--i == 0) {
+			printk(KERN_ERR "Mailbox send failure\n");
 			return -1;
+		}
 		udelay(1);
 	}
 	mbox_fifo_write(mbox, msg);