Skip to content

Commit

Permalink
Merge remote-tracking branch 'asoc/topic/fsl' into asoc-next
Browse files Browse the repository at this point in the history
  • Loading branch information
broonie committed Jun 22, 2015
2 parents 2924c96 + 474ff0a commit 1cdf4f6
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion sound/soc/fsl/imx-wm8962.c
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down

0 comments on commit 1cdf4f6

Please sign in to comment.