From patchwork Thu Jun  3 05:47:16 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: omar ramirez <omar.ramirez@ti.com>
X-Patchwork-Id: 103972
X-Patchwork-Delegate: omar.ramirez@ti.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 o535uFBX018351
	for <patchwork-omap@patchwork.kernel.org>;
	Thu, 3 Jun 2010 05:56:16 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1752989Ab0FCF4P (ORCPT
	<rfc822;patchwork-omap@patchwork.kernel.org>);
	Thu, 3 Jun 2010 01:56:15 -0400
Received: from arroyo.ext.ti.com ([192.94.94.40]:56422 "EHLO
	arroyo.ext.ti.com"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1752806Ab0FCF4O (ORCPT <rfc822;linux-omap@vger.kernel.org>);
	Thu, 3 Jun 2010 01:56:14 -0400
Received: from dlep35.itg.ti.com ([157.170.170.118])
	by arroyo.ext.ti.com (8.13.7/8.13.7) with ESMTP id o535uCfx020728
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO);
	Thu, 3 Jun 2010 00:56:12 -0500
Received: from legion.dal.design.ti.com (localhost [127.0.0.1])
	by dlep35.itg.ti.com (8.13.7/8.13.7) with ESMTP id o535u9mW009369;
	Thu, 3 Jun 2010 00:56:09 -0500 (CDT)
Received: from localhost (bacab.am.dhcp.ti.com [128.247.77.143])
	by legion.dal.design.ti.com (8.11.7p1+Sun/8.11.7) with ESMTP id
	o535u9P27786; Thu, 3 Jun 2010 00:56:09 -0500 (CDT)
From: Omar Ramirez Luna <omar.ramirez@ti.com>
To: linux-omap <linux-omap@vger.kernel.org>
Cc: Omar Ramirez Luna <omar.ramirez@ti.com>,
	Shivananda Hebbar <x0hebbar@ti.com>,
	Hiroshi DOYU <Hiroshi.DOYU@nokia.com>,
	Fernando Guzman Lugo <x0095840@ti.com>,
	Ivan Gomez Castellanos <ivan.gomez@ti.com>,
	Ernesto Ramos <ernesto@ti.com>, Armando Uribe De Leon <x0095078@ti.com>,
	Ameya Palande <ameya.palande@nokia.com>,
	Felipe Contreras <felipe.contreras@nokia.com>
Subject: [PATCH 03/40] DSPBRIDGE: err code replace CHNL_E_WAITTIMEOUT with
	ETIMEDOUT
Date: Thu,  3 Jun 2010 00:47:16 -0500
Message-Id: <1275544073-20418-4-git-send-email-omar.ramirez@ti.com>
X-Mailer: git-send-email 1.7.1
In-Reply-To: <1275544073-20418-1-git-send-email-omar.ramirez@ti.com>
References: <1275544073-20418-1-git-send-email-omar.ramirez@ti.com>
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, 03 Jun 2010 05:56:16 +0000 (UTC)


diff --git a/arch/arm/plat-omap/include/dspbridge/dspdefs.h b/arch/arm/plat-omap/include/dspbridge/dspdefs.h
index 8ee21fd..7157029 100644
--- a/arch/arm/plat-omap/include/dspbridge/dspdefs.h
+++ b/arch/arm/plat-omap/include/dspbridge/dspdefs.h
@@ -610,7 +610,7 @@ typedef dsp_status(*fxn_chnl_getmgrinfo) (struct chnl_mgr
  *  Returns:
  *      0:            Success;
  *      -EFAULT:        Invalid chnl_obj.
- *      CHNL_E_WAITTIMEOUT: Timeout occured before channel could be idled.
+ *      -ETIMEDOUT: Timeout occured before channel could be idled.
  *  Requires:
  *  Ensures:
  */
diff --git a/drivers/dsp/bridge/core/chnl_sm.c b/drivers/dsp/bridge/core/chnl_sm.c
index 81106df..a4946c2 100644
--- a/drivers/dsp/bridge/core/chnl_sm.c
+++ b/drivers/dsp/bridge/core/chnl_sm.c
@@ -517,7 +517,7 @@ dsp_status bridge_chnl_flush_io(struct chnl_object *chnl_obj, u32 dwTimeOut)
 					continue;
 
 				if (chnl_ioc_obj.status & CHNL_IOCSTATTIMEOUT)
-					status = CHNL_E_WAITTIMEOUT;
+					status = -ETIMEDOUT;
 
 			}
 		} else {