redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

spi: mediatek: revise mtk_spi_probe() failure flow 

mtk_spi_probe() calls pm_runtime_enable(), after
pm_runtime_enable() is called, it should call
pm_runtime_disable() in the failure flow.

Signed-off-by: Leilk Liu <leilk.liu@mediatek.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
hifive-unleashed-5.1
Leilk Liu 2015-11-25 17:50:38 +08:00 committed by Mark Brown
parent 4d920471d7
commit e38da37fa8
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/spi/spi-mt65xx.c
View File

@ -607,7 +607,8 @@ static int mtk_spi_probe(struct platform_device *pdev)
ret = clk_set_parent(mdata->sel_clk, mdata->parent_clk);
if (ret < 0) {
dev_err(&pdev->dev, "failed to clk_set_parent (%d)\n", ret);
goto err_disable_clk;
clk_disable_unprepare(mdata->spi_clk);
goto err_put_master;
}
clk_disable_unprepare(mdata->spi_clk);
@ -617,7 +618,7 @@ static int mtk_spi_probe(struct platform_device *pdev)
ret = devm_spi_register_master(&pdev->dev, master);
if (ret) {
dev_err(&pdev->dev, "failed to register master (%d)\n", ret);
goto err_put_master;
goto err_disable_runtime_pm;
}
if (mdata->dev_comp->need_pad_sel) {
@ -626,14 +627,14 @@ static int mtk_spi_probe(struct platform_device *pdev)
"pad_num does not match num_chipselect(%d != %d)\n",
mdata->pad_num, master->num_chipselect);
ret = -EINVAL;
goto err_put_master;
goto err_disable_runtime_pm;
}
if (!master->cs_gpios && master->num_chipselect > 1) {
dev_err(&pdev->dev,
"cs_gpios not specified and num_chipselect > 1\n");
ret = -EINVAL;
goto err_put_master;
goto err_disable_runtime_pm;
}
if (master->cs_gpios) {
@ -644,7 +645,7 @@ static int mtk_spi_probe(struct platform_device *pdev)
if (ret) {
dev_err(&pdev->dev,
"can't get CS GPIO %i\n", i);
goto err_put_master;
goto err_disable_runtime_pm;
}
}
}
@ -652,8 +653,8 @@ static int mtk_spi_probe(struct platform_device *pdev)
return 0;
err_disable_clk:
clk_disable_unprepare(mdata->spi_clk);
err_disable_runtime_pm:
pm_runtime_disable(&pdev->dev);
err_put_master:
spi_master_put(master);