aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/spi/spi-mt65xx.c
diff options
context:
space:
mode:
authorJavier Martinez Canillas <javier@osg.samsung.com>2015-09-15 08:46:45 -0400
committerMark Brown <broonie@kernel.org>2015-09-16 15:45:11 -0400
commite26d15f735f570a1178c3bba4d85e6f58e098fdd (patch)
tree9197d5d71ecede4f53f49851d49cdf9dc56b2455 /drivers/spi/spi-mt65xx.c
parent3d4fe182003bcde778e29e84c14c0c4bb70a452e (diff)
spi: mediatek: fix wrong error return value on probe
Commit adcbcfea15d62 ("spi: mediatek: fix spi clock usage error") added a new sel_clk but introduced bugs in the error paths since the wrong struct clk pointers are passed to PTR_ERR(). Fixes: adcbcfea15d62 ("spi: mediatek: fix spi clock usage error") Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers/spi/spi-mt65xx.c')
-rw-r--r--drivers/spi/spi-mt65xx.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/spi/spi-mt65xx.c b/drivers/spi/spi-mt65xx.c
index 6fbb5e5132b0..e9839a4e0175 100644
--- a/drivers/spi/spi-mt65xx.c
+++ b/drivers/spi/spi-mt65xx.c
@@ -585,14 +585,14 @@ static int mtk_spi_probe(struct platform_device *pdev)
585 585
586 mdata->sel_clk = devm_clk_get(&pdev->dev, "sel-clk"); 586 mdata->sel_clk = devm_clk_get(&pdev->dev, "sel-clk");
587 if (IS_ERR(mdata->sel_clk)) { 587 if (IS_ERR(mdata->sel_clk)) {
588 ret = PTR_ERR(mdata->spi_clk); 588 ret = PTR_ERR(mdata->sel_clk);
589 dev_err(&pdev->dev, "failed to get sel-clk: %d\n", ret); 589 dev_err(&pdev->dev, "failed to get sel-clk: %d\n", ret);
590 goto err_put_master; 590 goto err_put_master;
591 } 591 }
592 592
593 mdata->spi_clk = devm_clk_get(&pdev->dev, "spi-clk"); 593 mdata->spi_clk = devm_clk_get(&pdev->dev, "spi-clk");
594 if (IS_ERR(mdata->spi_clk)) { 594 if (IS_ERR(mdata->spi_clk)) {
595 ret = PTR_ERR(mdata->parent_clk); 595 ret = PTR_ERR(mdata->spi_clk);
596 dev_err(&pdev->dev, "failed to get spi-clk: %d\n", ret); 596 dev_err(&pdev->dev, "failed to get spi-clk: %d\n", ret);
597 goto err_put_master; 597 goto err_put_master;
598 } 598 }