From: Mark Brown <broonie@linaro.org>
Date: Mon, 7 Oct 2013 13:51:58 +0000 (+0100)
Subject: Merge remote-tracking branch 'spi/fix/mpc512x' into spi-linus
X-Git-Tag: v3.12-rc5~22^2~2
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=b242954b3cb8cb710a5c72fdd509f659748f6973;hp=78e9fa521e4716f37bff3a44c29553147acb8321;p=karo-tx-linux.git

Merge remote-tracking branch 'spi/fix/mpc512x' into spi-linus
---

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,
 	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;