summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorJulia Lawall <Julia.Lawall@lip6.fr>2012-08-19 09:02:52 +0200
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-08-20 20:44:19 +0100
commitdb8b624d55e65ad5d8211a9fef66fa7f16bd13a0 (patch)
tree5cc157b6b12e186d6c29537e69c748be2867396d /sound
parentd9875690d9b89a866022ff49e3fcea892345ad92 (diff)
downloadlinux-3.10-db8b624d55e65ad5d8211a9fef66fa7f16bd13a0.tar.gz
linux-3.10-db8b624d55e65ad5d8211a9fef66fa7f16bd13a0.tar.bz2
linux-3.10-db8b624d55e65ad5d8211a9fef66fa7f16bd13a0.zip
ASoC: imx-sgtl5000: fix error return code
Initialize ret on the second call to imx_audmux_v2_configure_port so that the subsequent test checks that result and not the previous one. A simplified version of the semantic match that finds this problem is as follows: (http://coccinelle.lip6.fr/) // <smpl> ( if@p1 (\(ret < 0\|ret != 0\)) { ... return ret; } | ret@p1 = 0 ) ... when != ret = e1 when != &ret *if(...) { ... when != ret = e2 when forall return ret; } // </smpl> Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/fsl/imx-sgtl5000.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/fsl/imx-sgtl5000.c b/sound/soc/fsl/imx-sgtl5000.c
index fb21b17f17f..199408ec426 100644
--- a/sound/soc/fsl/imx-sgtl5000.c
+++ b/sound/soc/fsl/imx-sgtl5000.c
@@ -94,7 +94,7 @@ static int __devinit imx_sgtl5000_probe(struct platform_device *pdev)
dev_err(&pdev->dev, "audmux internal port setup failed\n");
return ret;
}
- imx_audmux_v2_configure_port(ext_port,
+ ret = imx_audmux_v2_configure_port(ext_port,
IMX_AUDMUX_V2_PTCR_SYN,
IMX_AUDMUX_V2_PDCR_RXDSEL(int_port));
if (ret) {