diff options
author | Mark Brown <broonie@linaro.org> | 2013-10-07 09:51:58 -0400 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-10-07 09:51:58 -0400 |
commit | b242954b3cb8cb710a5c72fdd509f659748f6973 (patch) | |
tree | 5bec3b43824e574311a0eafb7bf8910a2d440178 | |
parent | 78e9fa521e4716f37bff3a44c29553147acb8321 (diff) | |
parent | eadf69cf5e1cdd042fb7b7beeffa538a935373cd (diff) |
Merge remote-tracking branch 'spi/fix/mpc512x' into spi-linus
-rw-r--r-- | drivers/spi/spi-mpc512x-psc.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/spi/spi-mpc512x-psc.c b/drivers/spi/spi-mpc512x-psc.c index dbc5e999a1f5..6adf4e35816d 100644 --- a/drivers/spi/spi-mpc512x-psc.c +++ b/drivers/spi/spi-mpc512x-psc.c | |||
@@ -522,8 +522,10 @@ static int mpc512x_psc_spi_do_probe(struct device *dev, u32 regaddr, | |||
522 | psc_num = master->bus_num; | 522 | psc_num = master->bus_num; |
523 | snprintf(clk_name, sizeof(clk_name), "psc%d_mclk", psc_num); | 523 | snprintf(clk_name, sizeof(clk_name), "psc%d_mclk", psc_num); |
524 | clk = devm_clk_get(dev, clk_name); | 524 | clk = devm_clk_get(dev, clk_name); |
525 | if (IS_ERR(clk)) | 525 | if (IS_ERR(clk)) { |
526 | ret = PTR_ERR(clk); | ||
526 | goto free_irq; | 527 | goto free_irq; |
528 | } | ||
527 | ret = clk_prepare_enable(clk); | 529 | ret = clk_prepare_enable(clk); |
528 | if (ret) | 530 | if (ret) |
529 | goto free_irq; | 531 | goto free_irq; |