diff options
| author | Stefan Agner <stefan.agner@toradex.com> | 2015-08-04 17:52:00 +0200 |
|---|---|---|
| committer | Stefan Agner <stefan.agner@toradex.com> | 2015-08-04 17:52:00 +0200 |
| commit | 073b50be0713f8cba043935e1daae714e66026db (patch) | |
| tree | ed0a71b56576df2637ffa9a4d3dae8d836b63428 /sound/soc/fsl | |
| parent | 3a5c56b021108a9c2aeead3109946cd4f2fc7078 (diff) | |
| parent | 89e419960fb6a260f6a112821507d516117d5aa1 (diff) | |
Merge tag 'v4.1.4' into toradex_vf_4.1-next
This is the 4.1.4 stable release
Diffstat (limited to 'sound/soc/fsl')
| -rw-r--r-- | sound/soc/fsl/imx-wm8962.c | 2 |
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) { |