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

This commit is contained in:
Mark Brown 2015-06-22 10:24:30 +01:00
commit 1cdf4f6113

View file

@ -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) {