Browse Source

spi: spi-orion: check return value from clk_prepare()/clk_enable()

clk_prepare()/clk_enable() can fail, and it's return value should
be checked.  Add the proper checking, and while we're here, convert
to clk_prepare_enable().

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Mark Brown <broonie@linaro.org>
Russell King 11 years ago
parent
commit
c85012addd
1 changed files with 4 additions and 2 deletions
  1. 4 2
      drivers/spi/spi-orion.c

+ 4 - 2
drivers/spi/spi-orion.c

@@ -382,8 +382,10 @@ static int orion_spi_probe(struct platform_device *pdev)
 		goto out;
 		goto out;
 	}
 	}
 
 
-	clk_prepare(spi->clk);
-	clk_enable(spi->clk);
+	status = clk_prepare_enable(spi->clk);
+	if (status)
+		goto out;
+
 	tclk_hz = clk_get_rate(spi->clk);
 	tclk_hz = clk_get_rate(spi->clk);
 	master->max_speed_hz = DIV_ROUND_UP(tclk_hz, 4);
 	master->max_speed_hz = DIV_ROUND_UP(tclk_hz, 4);
 	master->min_speed_hz = DIV_ROUND_UP(tclk_hz, 30);
 	master->min_speed_hz = DIV_ROUND_UP(tclk_hz, 30);