mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-14 14:42:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

staging: mt7621-mmc: Fix bug on dma_alloc_coherent fail

Browse Source 
In case of dma_alloc_coherent failing the current code just called
BUG_ON. By adding error handling for that case this can be avoided.
This also fixes a memory leek in case of a fail later on in the probe
function.

Signed-off-by: Christian Lütke-Stetzkamp <christian@lkamp.de>
Reviewed-by: NeilBrown <neil@brown.name>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Christian Lütke-Stetzkamp
2018-04-04 22:15:36 +02:00
committed by Greg Kroah-Hartman
parent d6e9e06861
commit 36ff37c6ca
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/staging/mt7621-mmc/sd.c
View File

@@ -2787,7 +2787,10 @@ static int msdc_drv_probe(struct platform_device *pdev)
/* using dma_alloc_coherent*/ /* todo: using 1, for all 4 slots */
host->dma.gpd = dma_alloc_coherent(NULL, MAX_GPD_NUM * sizeof(struct gpd), &host->dma.gpd_addr, GFP_KERNEL);
host->dma.bd = dma_alloc_coherent(NULL, MAX_BD_NUM * sizeof(struct bd), &host->dma.bd_addr, GFP_KERNEL);
BUG_ON((!host->dma.gpd) || (!host->dma.bd));
if (!host->dma.gpd || !host->dma.bd) {
ret = -ENOMEM;
goto release_mem;
}
msdc_init_gpd_bd(host, &host->dma);
/*for emmc*/
msdc_6575_host[pdev->id] = host;
@@ -2855,6 +2858,13 @@ static int msdc_drv_probe(struct platform_device *pdev)
cancel_delayed_work_sync(&host->card_delaywork);
#endif
release_mem:
if (host->dma.gpd)
dma_free_coherent(NULL, MAX_GPD_NUM * sizeof(struct gpd),
host->dma.gpd, host->dma.gpd_addr);
if (host->dma.bd)
dma_free_coherent(NULL, MAX_BD_NUM * sizeof(struct bd),
host->dma.bd, host->dma.bd_addr);
host_free:
mmc_free_host(mmc);