diff options
| author | Andi Shyti <andi.shyti@samsung.com> | 2016-07-12 19:02:13 +0900 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-07-14 17:28:31 +0100 |
| commit | 25981d8281ee4cbbd6f7c5bc0f8c048ad9548037 (patch) | |
| tree | 63c4dd6e515a498ce9c1434f9156a5cfc09fdda4 /drivers/spi | |
| parent | 60a9a964420912a4c4b66efd210d98006177695a (diff) | |
| download | op-kernel-dev-25981d8281ee4cbbd6f7c5bc0f8c048ad9548037.zip op-kernel-dev-25981d8281ee4cbbd6f7c5bc0f8c048ad9548037.tar.gz | |
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: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Signed-off-by: Andi Shyti <andi.shyti@samsung.com>
Reviewed-by: Michael Turquette <mturquette@baylibre.com>
Reviewed-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers/spi')
| -rw-r--r-- | drivers/spi/spi-s3c64xx.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/spi/spi-s3c64xx.c b/drivers/spi/spi-s3c64xx.c index 0a93eb9..3d21f8a 100644 --- a/drivers/spi/spi-s3c64xx.c +++ b/drivers/spi/spi-s3c64xx.c @@ -1133,9 +1133,9 @@ static int s3c64xx_spi_probe(struct platform_device *pdev) 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"); - ret = -EBUSY; goto err_deref_master; } @@ -1148,9 +1148,9 @@ static int s3c64xx_spi_probe(struct platform_device *pdev) 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); - ret = -EBUSY; goto err_disable_clk; } |
