Commit cf3f15b8 authored by Harshit Mogalapalli's avatar Harshit Mogalapalli Committed by Ulf Hansson

mmc: sunplus: Fix error handling in spmmc_drv_probe()

When mmc allocation succeeds, the error paths are not freeing mmc.

Fix the above issue by changing mmc_alloc_host() to devm_mmc_alloc_host()
to simplify the error handling. Remove label 'probe_free_host' as devm_*
api takes care of freeing, also remove mmc_free_host() from remove
function as devm_* takes care of freeing.

Fixes: 4e268fed ("mmc: Add mmc driver for Sunplus SP7021")
Reported-by: default avatarDan Carpenter <dan.carpenter@linaro.org>
Closes: https://lore.kernel.org/all/a3829ed3-d827-4b9d-827e-9cc24a3ec3bc@moroto.mountain/Signed-off-by: default avatarHarshit Mogalapalli <harshit.m.mogalapalli@oracle.com>
Reviewed-by: default avatarDan Carpenter <dan.carpenter@linaro.org>
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/r/20230809071812.547229-1-harshit.m.mogalapalli@oracle.comSigned-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent dce6d8f9
...@@ -863,11 +863,9 @@ static int spmmc_drv_probe(struct platform_device *pdev) ...@@ -863,11 +863,9 @@ static int spmmc_drv_probe(struct platform_device *pdev)
struct spmmc_host *host; struct spmmc_host *host;
int ret = 0; int ret = 0;
mmc = mmc_alloc_host(sizeof(*host), &pdev->dev); mmc = devm_mmc_alloc_host(&pdev->dev, sizeof(struct spmmc_host));
if (!mmc) { if (!mmc)
ret = -ENOMEM; return -ENOMEM;
goto probe_free_host;
}
host = mmc_priv(mmc); host = mmc_priv(mmc);
host->mmc = mmc; host->mmc = mmc;
...@@ -938,11 +936,6 @@ static int spmmc_drv_probe(struct platform_device *pdev) ...@@ -938,11 +936,6 @@ static int spmmc_drv_probe(struct platform_device *pdev)
clk_disable: clk_disable:
clk_disable_unprepare(host->clk); clk_disable_unprepare(host->clk);
probe_free_host:
if (mmc)
mmc_free_host(mmc);
return ret; return ret;
} }
...@@ -956,7 +949,6 @@ static int spmmc_drv_remove(struct platform_device *dev) ...@@ -956,7 +949,6 @@ static int spmmc_drv_remove(struct platform_device *dev)
pm_runtime_put_noidle(&dev->dev); pm_runtime_put_noidle(&dev->dev);
pm_runtime_disable(&dev->dev); pm_runtime_disable(&dev->dev);
platform_set_drvdata(dev, NULL); platform_set_drvdata(dev, NULL);
mmc_free_host(host->mmc);
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment