Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 25981d82 authored by Andi Shyti's avatar Andi Shyti Committed by Mark Brown
Browse files

spi: s3c64xx: use error code from clk_prepare_enable() 



If clk_prepare_enable() fails do not return -EBUSY but use the
value provided by the function itself.

Suggested-by: default avatarKrzysztof Kozlowski <k.kozlowski@samsung.com>
Signed-off-by: default avatarAndi Shyti <andi.shyti@samsung.com>
Reviewed-by: default avatarMichael Turquette <mturquette@baylibre.com>
Reviewed-by: default avatarKrzysztof Kozlowski <k.kozlowski@samsung.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 60a9a964

drivers/spi/spi-s3c64xx.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -1133,9 +1133,9 @@ static int s3c64xx_spi_probe(struct platform_device *pdev) 
		goto err_deref_master;

		goto err_deref_master;

	}

	}





	if (clk_prepare_enable(sdd->clk)) {

	ret = clk_prepare_enable(sdd->clk);

	if (ret) {

		dev_err(&pdev->dev, "Couldn't enable clock 'spi'\n");

		dev_err(&pdev->dev, "Couldn't enable clock 'spi'\n");

		ret = -EBUSY;

		goto err_deref_master;

		goto err_deref_master;

	}

	}
@@ -1148,9 +1148,9 @@ static int s3c64xx_spi_probe(struct platform_device *pdev) 
		goto err_disable_clk;

		goto err_disable_clk;

	}

	}





	if (clk_prepare_enable(sdd->src_clk)) {

	ret = clk_prepare_enable(sdd->src_clk);

	if (ret) {

		dev_err(&pdev->dev, "Couldn't enable clock '%s'\n", clk_name);

		dev_err(&pdev->dev, "Couldn't enable clock '%s'\n", clk_name);

		ret = -EBUSY;

		goto err_disable_clk;

		goto err_disable_clk;

	}

	}