summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZhao Qiang <B45475@freescale.com>2014-06-26 11:26:43 +0800
committerMark Brown <broonie@linaro.org>2014-07-02 20:50:17 +0100
commitef4bbdec95cfa64d188e05aea64cbb16a21d7d97 (patch)
tree6b704e26f871c3e8e7a83583aa2b306b3f9e159a
parent7171511eaec5bf23fb06078f59784a3a0626b38f (diff)
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>
-rw-r--r--drivers/spi/spi-fsl-lib.c2
1 files changed, 1 insertions, 1 deletions
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;