|
@@ -563,7 +563,10 @@ static int mxs_spi_probe(struct platform_device *pdev)
|
|
|
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);
|
|
|
ssp->clk_rate = clk_get_rate(ssp->clk) / 1000;
|
|
|
|
|
@@ -574,13 +577,14 @@ static int mxs_spi_probe(struct platform_device *pdev)
|
|
|
ret = spi_register_master(master);
|
|
|
if (ret) {
|
|
|
dev_err(&pdev->dev, "Cannot register SPI master, %d\n", ret);
|
|
|
- goto out_free_dma;
|
|
|
+ goto out_disable_clk;
|
|
|
}
|
|
|
|
|
|
return 0;
|
|
|
|
|
|
-out_free_dma:
|
|
|
+out_disable_clk:
|
|
|
clk_disable_unprepare(ssp->clk);
|
|
|
+out_dma_release:
|
|
|
dma_release_channel(ssp->dmach);
|
|
|
out_master_free:
|
|
|
spi_master_put(master);
|