Message ID | 1275544073-20418-4-git-send-email-omar.ramirez@ti.com (mailing list archive) |
---|---|
State | Accepted |
Delegated to: | |
Headers | show |
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 {