From 85a967b9f403c43d0575cbe369f28d39a9ba0776 Mon Sep 17 00:00:00 2001 From: Daniel Kurtz Date: Thu, 15 Oct 2015 15:56:54 +0800 Subject: [PATCH] UPSTREAM: 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 Signed-off-by: Mark Brown (cherry picked from commit e26d15f735f570a1178c3bba4d85e6f58e098fdd) Signed-off-by: Leilk Liu BUG=chrome-os-partner:40544 TEST=build and boot oak-rev3 Change-Id: Ie03c78766c84ce8b2d91e85fd44a6ac0f0cde9a0 Reviewed-on: https://chromium-review.googlesource.com/305890 Commit-Ready: Daniel Kurtz Tested-by: Daniel Kurtz Reviewed-by: Daniel Kurtz --- drivers/spi/spi-mt65xx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/spi/spi-mt65xx.c b/drivers/spi/spi-mt65xx.c index 26ec09b803c09..ecb6c58238c4f 100644 --- a/drivers/spi/spi-mt65xx.c +++ b/drivers/spi/spi-mt65xx.c @@ -572,14 +572,14 @@ static int mtk_spi_probe(struct platform_device *pdev) mdata->sel_clk = devm_clk_get(&pdev->dev, "sel-clk"); if (IS_ERR(mdata->sel_clk)) { - ret = PTR_ERR(mdata->spi_clk); + ret = PTR_ERR(mdata->sel_clk); dev_err(&pdev->dev, "failed to get sel-clk: %d\n", ret); goto err_put_master; } mdata->spi_clk = devm_clk_get(&pdev->dev, "spi-clk"); if (IS_ERR(mdata->spi_clk)) { - ret = PTR_ERR(mdata->parent_clk); + ret = PTR_ERR(mdata->spi_clk); dev_err(&pdev->dev, "failed to get spi-clk: %d\n", ret); goto err_put_master; }