UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

spi: dw-mmio: prepare the clock before enabling 

This is required for common clock support.

Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Mark Brown <broonie@linaro.org>
This commit is contained in:
Baruch Siach 2013-12-30 20:30:45 +02:00 committed by Mark Brown
parent 04f421e7b0
commit 020fe3fe11
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/spi/spi-dw-mmio.c
View File

@ -62,7 +62,7 @@ static int dw_spi_mmio_probe(struct platform_device *pdev)
dwsmmio->clk = devm_clk_get(&pdev->dev, NULL); dwsmmio->clk = devm_clk_get(&pdev->dev, NULL);
if (IS_ERR(dwsmmio->clk)) if (IS_ERR(dwsmmio->clk))
return PTR_ERR(dwsmmio->clk); return PTR_ERR(dwsmmio->clk);
ret = clk_enable(dwsmmio->clk); ret = clk_prepare_enable(dwsmmio->clk);
if (ret) if (ret)
return ret; return ret;
@ -78,7 +78,7 @@ static int dw_spi_mmio_probe(struct platform_device *pdev)
return 0; return 0;
out: out:
clk_disable(dwsmmio->clk); clk_disable_unprepare(dwsmmio->clk);
return ret; return ret;
} }
@ -86,7 +86,7 @@ static int dw_spi_mmio_remove(struct platform_device *pdev)
{ {
struct dw_spi_mmio *dwsmmio = platform_get_drvdata(pdev); struct dw_spi_mmio *dwsmmio = platform_get_drvdata(pdev);
clk_disable(dwsmmio->clk); clk_disable_unprepare(dwsmmio->clk);
dw_spi_remove_host(&dwsmmio->dws); dw_spi_remove_host(&dwsmmio->dws);
return 0; return 0;