Replace CHNL_E_OUTOFSTREAMS with ENOSR
Signed-off-by: Omar Ramirez Luna <omar.ramirez@xxxxxx>
---
arch/arm/plat-omap/include/dspbridge/dspdefs.h | 2 +-
drivers/dsp/bridge/core/chnl_sm.c | 2 +-
drivers/dsp/bridge/rmgr/strm.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/arm/plat-omap/include/dspbridge/dspdefs.h b/arch/arm/plat-omap/include/dspbridge/dspdefs.h
index c4b0922..c3c2e4d 100644
--- a/arch/arm/plat-omap/include/dspbridge/dspdefs.h
+++ b/arch/arm/plat-omap/include/dspbridge/dspdefs.h
@@ -392,7 +392,7 @@ typedef void (*fxn_deh_notify) (struct deh_mgr *hdeh_mgr,
* -EFAULT: hchnl_mgr is invalid.
* -ENOMEM: Insufficient memory for requested resources.
* -EINVAL: Invalid number of IOReqs.
- * CHNL_E_OUTOFSTREAMS: No free channels available.
+ * -ENOSR: No free channels available.
* -ECHRNG: Channel ID is out of range.
* -EALREADY: Channel is in use.
* -EIO: No free IO request packets available for
diff --git a/drivers/dsp/bridge/core/chnl_sm.c b/drivers/dsp/bridge/core/chnl_sm.c
index db03db6..67132c2 100644
--- a/drivers/dsp/bridge/core/chnl_sm.c
+++ b/drivers/dsp/bridge/core/chnl_sm.c
@@ -1003,7 +1003,7 @@ static struct chnl_irp *make_new_chirp(void)
static dsp_status search_free_channel(struct chnl_mgr *chnl_mgr_obj,
OUT u32 *pdwChnl)
{
- dsp_status status = CHNL_E_OUTOFSTREAMS;
+ dsp_status status = -ENOSR;
u32 i;
DBC_REQUIRE(chnl_mgr_obj);
diff --git a/drivers/dsp/bridge/rmgr/strm.c b/drivers/dsp/bridge/rmgr/strm.c
index c31a5c1..d560503 100644
--- a/drivers/dsp/bridge/rmgr/strm.c
+++ b/drivers/dsp/bridge/rmgr/strm.c
@@ -584,7 +584,7 @@ func_cont:
* strm_mgr_obj->hchnl_mgr better be valid or we
* assert here), and then return -EPERM.
*/
- DBC_ASSERT(status == CHNL_E_OUTOFSTREAMS ||
+ DBC_ASSERT(status == -ENOSR ||
status == -ECHRNG ||
status == -EALREADY ||
status == -EIO);
--
1.7.1
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
