From: Zhao Qiang <B45475@freescale.com>
Date: Thu, 26 Jun 2014 03:26:43 +0000 (+0800)
Subject: spi/fsl: deal with a compile warning
X-Git-Tag: v3.17-rc1~114^2~2^4
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=ef4bbdec95cfa64d188e05aea64cbb16a21d7d97;p=karo-tx-linux.git

spi/fsl: deal with a compile warning

ret is unused when CONFIG_FSL_SOC defined,
so return ret instead of -ENOMEM when the
kzalloc fails to avoid it.

Signed-off-by: Zhao Qiang <B45475@freescale.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
---

diff --git a/drivers/spi/spi-fsl-lib.c b/drivers/spi/spi-fsl-lib.c
index 95212ea96c8d..e0b773fc29cb 100644
--- a/drivers/spi/spi-fsl-lib.c
+++ b/drivers/spi/spi-fsl-lib.c
@@ -196,7 +196,7 @@ int of_mpc8xxx_spi_probe(struct platform_device *ofdev)
 
 	pinfo = devm_kzalloc(&ofdev->dev, sizeof(*pinfo), GFP_KERNEL);
 	if (!pinfo)
-		return -ENOMEM;
+		return ret;
 
 	pdata = &pinfo->pdata;
 	dev->platform_data = pdata;