summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-06-22 12:24:30 +0300
committerMark Brown <broonie@kernel.org>2015-06-22 12:24:30 +0300
commit1cdf4f6113d2fbe98bb528f6b51a682f24d3aac1 (patch)
tree654af7bf80e3b19497c890a100664d6f202460f7 /sound
parent2924c96276b74c876589eaabd96ddddac700cf85 (diff)
parent474ff0ae23b834e9fc18374d14bb5f3e7b3828b4 (diff)
downloadlinux-1cdf4f6113d2fbe98bb528f6b51a682f24d3aac1.tar.xz
Merge remote-tracking branch 'asoc/topic/fsl' into asoc-next
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/fsl/imx-wm8962.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/fsl/imx-wm8962.c b/sound/soc/fsl/imx-wm8962.c
index cd146d4fa805..b38b98cae855 100644
--- a/sound/soc/fsl/imx-wm8962.c
+++ b/sound/soc/fsl/imx-wm8962.c
@@ -190,7 +190,7 @@ static int imx_wm8962_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) {