Commit 9c4a39af authored by Fabio Estevam's avatar Fabio Estevam Committed by Mark Brown

spi: spi-mxs: Check the return value from clk_prepare_enable()

clk_prepare_enable() may fail, so let's check its return value and propagate it
in the case of error.

While at it, rename 'out_free_dma' to 'out_disable_clk' so that it can properly
describe its purpose.
Signed-off-by: default avatarFabio Estevam <fabio.estevam@freescale.com>
Acked-by: default avatarMarek Vasut <marex@denx.de>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent e11933f6
...@@ -563,7 +563,10 @@ static int mxs_spi_probe(struct platform_device *pdev) ...@@ -563,7 +563,10 @@ static int mxs_spi_probe(struct platform_device *pdev)
goto out_master_free; goto out_master_free;
} }
clk_prepare_enable(ssp->clk); ret = clk_prepare_enable(ssp->clk);
if (ret)
goto out_dma_release;
clk_set_rate(ssp->clk, clk_freq); clk_set_rate(ssp->clk, clk_freq);
ssp->clk_rate = clk_get_rate(ssp->clk) / 1000; ssp->clk_rate = clk_get_rate(ssp->clk) / 1000;
...@@ -574,13 +577,14 @@ static int mxs_spi_probe(struct platform_device *pdev) ...@@ -574,13 +577,14 @@ static int mxs_spi_probe(struct platform_device *pdev)
ret = spi_register_master(master); ret = spi_register_master(master);
if (ret) { if (ret) {
dev_err(&pdev->dev, "Cannot register SPI master, %d\n", ret); dev_err(&pdev->dev, "Cannot register SPI master, %d\n", ret);
goto out_free_dma; goto out_disable_clk;
} }
return 0; return 0;
out_free_dma: out_disable_clk:
clk_disable_unprepare(ssp->clk); clk_disable_unprepare(ssp->clk);
out_dma_release:
dma_release_channel(ssp->dmach); dma_release_channel(ssp->dmach);
out_master_free: out_master_free:
spi_master_put(master); spi_master_put(master);
......
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