Commit e38da37f authored by Leilk Liu's avatar Leilk Liu Committed by Mark Brown

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: default avatarLeilk Liu <leilk.liu@mediatek.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 4d920471
...@@ -607,7 +607,8 @@ static int mtk_spi_probe(struct platform_device *pdev) ...@@ -607,7 +607,8 @@ static int mtk_spi_probe(struct platform_device *pdev)
ret = clk_set_parent(mdata->sel_clk, mdata->parent_clk); ret = clk_set_parent(mdata->sel_clk, mdata->parent_clk);
if (ret < 0) { if (ret < 0) {
dev_err(&pdev->dev, "failed to clk_set_parent (%d)\n", ret); 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); clk_disable_unprepare(mdata->spi_clk);
...@@ -617,7 +618,7 @@ static int mtk_spi_probe(struct platform_device *pdev) ...@@ -617,7 +618,7 @@ static int mtk_spi_probe(struct platform_device *pdev)
ret = devm_spi_register_master(&pdev->dev, master); ret = devm_spi_register_master(&pdev->dev, master);
if (ret) { if (ret) {
dev_err(&pdev->dev, "failed to register master (%d)\n", 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) { if (mdata->dev_comp->need_pad_sel) {
...@@ -626,14 +627,14 @@ static int mtk_spi_probe(struct platform_device *pdev) ...@@ -626,14 +627,14 @@ static int mtk_spi_probe(struct platform_device *pdev)
"pad_num does not match num_chipselect(%d != %d)\n", "pad_num does not match num_chipselect(%d != %d)\n",
mdata->pad_num, master->num_chipselect); mdata->pad_num, master->num_chipselect);
ret = -EINVAL; ret = -EINVAL;
goto err_put_master; goto err_disable_runtime_pm;
} }
if (!master->cs_gpios && master->num_chipselect > 1) { if (!master->cs_gpios && master->num_chipselect > 1) {
dev_err(&pdev->dev, dev_err(&pdev->dev,
"cs_gpios not specified and num_chipselect > 1\n"); "cs_gpios not specified and num_chipselect > 1\n");
ret = -EINVAL; ret = -EINVAL;
goto err_put_master; goto err_disable_runtime_pm;
} }
if (master->cs_gpios) { if (master->cs_gpios) {
...@@ -644,7 +645,7 @@ static int mtk_spi_probe(struct platform_device *pdev) ...@@ -644,7 +645,7 @@ static int mtk_spi_probe(struct platform_device *pdev)
if (ret) { if (ret) {
dev_err(&pdev->dev, dev_err(&pdev->dev,
"can't get CS GPIO %i\n", i); "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) ...@@ -652,8 +653,8 @@ static int mtk_spi_probe(struct platform_device *pdev)
return 0; return 0;
err_disable_clk: err_disable_runtime_pm:
clk_disable_unprepare(mdata->spi_clk); pm_runtime_disable(&pdev->dev);
err_put_master: err_put_master:
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