git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branch 'asoc/topic/rcar' into asoc-next
[sfrench/cifs-2.6.git]
/
sound
/
soc
/
fsl
/
imx-wm8962.c
diff --git
a/sound/soc/fsl/imx-wm8962.c
b/sound/soc/fsl/imx-wm8962.c
index cd146d4fa8054fb0980abdda8a9fc506c1c4ef98..b38b98cae855d0d5529f00e50d379493a6d6f753 100644
(file)
--- 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) {