OrgACRN
/
sof
mirror of https://github.com/thesofproject/sof.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

dw-dma: fail probing if setting up the controller fails 

If the driver is unable to release the DMA controller, abort probing.

Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
This commit is contained in:
Guennadi Liakhovetski 2019-01-16 13:10:15 +01:00 committed by Liam Girdwood
parent 1f1e693d46
commit a9224c9bd7
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/drivers/dw/dma.c
View File

@ -1066,7 +1066,7 @@ static inline void dw_dma_chan_reload_next(struct dma *dma, int channel,
dw_write(dma, DW_DMA_CHAN_EN, CHAN_ENABLE(channel));
}
static void dw_dma_setup(struct dma *dma)
static int dw_dma_setup(struct dma *dma)
{
struct dw_drv_plat_data *dp = dma->plat_data.drv_plat_data;
int i;
@ -1083,7 +1083,7 @@ static void dw_dma_setup(struct dma *dma)
if (!i) {
trace_dwdma_error("dw-dma: dmac %d setup failed",
dma->plat_data.id);
return;
return -EIO;
}
for (i = 0; i < DW_MAX_CHAN; i++)
@ -1126,6 +1126,8 @@ static void dw_dma_setup(struct dma *dma)
DW_CFG_CLASS(dp->chan[i].class));
#endif
}
return 0;
}
static void dw_dma_process_block(struct dma_chan_data *chan,
@ -1397,7 +1399,7 @@ static inline void dw_dma_interrupt_unregister(struct dma *dma, int channel)
static int dw_dma_probe(struct dma *dma)
{
struct dma_pdata *dw_pdata;
int i;
int i, ret;
if (dma_get_drvdata(dma))
return -EEXIST; /* already created */
@ -1417,7 +1419,9 @@ static int dw_dma_probe(struct dma *dma)
spinlock_init(&dma->lock);
dw_dma_setup(dma);
ret = dw_dma_setup(dma);
if (ret < 0)
return ret;
/* init work */
for (i = 0; i < dma->plat_data.channels; i++) {