Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b19f40b8 authored by Ryo Kataoka's avatar Ryo Kataoka Committed by Vinod Koul
Browse files

dma: rcar-audmapp: Fix for no corresponding slave ID 



In case of no corresponding slave ID, the audmapp_set_slave() returns
-ENXIO same as sh_dmae_set_slave() of shdmac.c.
DMAEngine might return wrong channel without this patch

Signed-off-by: default avatarRyo Kataoka <ryo.kataoka.wt@renesas.com>
Signed-off-by: default avatarJun Watanabe <jun.watanabe.ue@renesas.com&gt;,>
Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
parent 58d06e98

drivers/dma/sh/rcar-audmapp.c

+10 −5
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ static void audmapp_start_xfer(struct shdma_chan *schan, 
	audmapp_write(auchan, chcr,	PDMACHCR);

}



static void audmapp_get_config(struct audmapp_chan *auchan, int slave_id,

static int audmapp_get_config(struct audmapp_chan *auchan, int slave_id,

			      u32 *chcr, dma_addr_t *dst)

{

	struct audmapp_device *audev = to_dev(auchan);
@@ -131,20 +131,22 @@ static void audmapp_get_config(struct audmapp_chan *auchan, int slave_id, 
	if (!pdata) { /* DT */

		*chcr = ((u32)slave_id) << 16;

		auchan->shdma_chan.slave_id = (slave_id) >> 8;

		return;

		return 0;

	}



	/* non-DT */



	if (slave_id >= AUDMAPP_SLAVE_NUMBER)

		return;

		return -ENXIO;



	for (i = 0, cfg = pdata->slave; i < pdata->slave_num; i++, cfg++)

		if (cfg->slave_id == slave_id) {

			*chcr	= cfg->chcr;

			*dst	= cfg->dst;

			break;

			return 0;

		}



	return -ENXIO;

}



static int audmapp_set_slave(struct shdma_chan *schan, int slave_id,
@@ -153,8 +155,11 @@ static int audmapp_set_slave(struct shdma_chan *schan, int slave_id, 
	struct audmapp_chan *auchan = to_chan(schan);

	u32 chcr;

	dma_addr_t dst;

	int ret;



	audmapp_get_config(auchan, slave_id, &chcr, &dst);

	ret = audmapp_get_config(auchan, slave_id, &chcr, &dst);

	if (ret < 0)

		return ret;



	if (try)

		return 0;