summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Pargmann2013-08-10 14:55:57 +0200
committerMark Brown2013-08-11 12:59:27 +0200
commit9c0aeaa3849150acaaf016202c6741d542b3c1df (patch)
tree7b9adbd2576dee61126264960bdec1f0f8b21e8e
parentASoC: imx-mc13783: Make SND_SOC_IMX_MC13783 visible again (diff)
downloadkernel-qcow2-linux-9c0aeaa3849150acaaf016202c6741d542b3c1df.tar.gz
kernel-qcow2-linux-9c0aeaa3849150acaaf016202c6741d542b3c1df.tar.xz
kernel-qcow2-linux-9c0aeaa3849150acaaf016202c6741d542b3c1df.zip
ASoC: imx-audmux: default configuration parser fixups
Signed-off-by: Markus Pargmann <mpa@pengutronix.de> Signed-off-by: Mark Brown <broonie@linaro.org>
-rw-r--r--sound/soc/fsl/imx-audmux.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/fsl/imx-audmux.c b/sound/soc/fsl/imx-audmux.c
index 103d1b020496..ab17381cc981 100644
--- a/sound/soc/fsl/imx-audmux.c
+++ b/sound/soc/fsl/imx-audmux.c
@@ -278,7 +278,7 @@ static int imx_audmux_parse_dt_defaults(struct platform_device *pdev,
}
for (i = 0; (ret = of_property_read_u32_index(child,
- "fsl,port-config\n", i, &val)) == 0;
+ "fsl,port-config", i, &val)) == 0;
++i) {
if (audmux_type == IMX31_AUDMUX) {
if (i % 2)
@@ -290,7 +290,7 @@ static int imx_audmux_parse_dt_defaults(struct platform_device *pdev,
}
}
- if (ret != -ENODATA) {
+ if (ret != -EOVERFLOW) {
dev_err(&pdev->dev, "Failed to read u32 at index %d of child %s\n",
i, child->full_name);
continue;