Commit 1cdf4f61 authored by Mark Brown's avatar Mark Brown

Merge remote-tracking branch 'asoc/topic/fsl' into asoc-next

parents 2924c962 474ff0ae
...@@ -190,7 +190,7 @@ static int imx_wm8962_probe(struct platform_device *pdev) ...@@ -190,7 +190,7 @@ static int imx_wm8962_probe(struct platform_device *pdev)
dev_err(&pdev->dev, "audmux internal port setup failed\n"); dev_err(&pdev->dev, "audmux internal port setup failed\n");
return ret; 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_PTCR_SYN,
IMX_AUDMUX_V2_PDCR_RXDSEL(int_port)); IMX_AUDMUX_V2_PDCR_RXDSEL(int_port));
if (ret) { if (ret) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment