diff options
| author | Mark Brown <broonie@linaro.org> | 2013-10-07 14:51:58 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-10-07 14:51:58 +0100 |
| commit | b242954b3cb8cb710a5c72fdd509f659748f6973 (patch) | |
| tree | 5bec3b43824e574311a0eafb7bf8910a2d440178 | |
| parent | 78e9fa521e4716f37bff3a44c29553147acb8321 (diff) | |
| parent | eadf69cf5e1cdd042fb7b7beeffa538a935373cd (diff) | |
| download | op-kernel-dev-b242954b3cb8cb710a5c72fdd509f659748f6973.zip op-kernel-dev-b242954b3cb8cb710a5c72fdd509f659748f6973.tar.gz | |
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 dbc5e99..6adf4e3 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, psc_num = master->bus_num; snprintf(clk_name, sizeof(clk_name), "psc%d_mclk", psc_num); clk = devm_clk_get(dev, clk_name); - if (IS_ERR(clk)) + if (IS_ERR(clk)) { + ret = PTR_ERR(clk); goto free_irq; + } ret = clk_prepare_enable(clk); if (ret) goto free_irq; |
