summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorMaciej S. Szmigiero <mail@maciej.szmigiero.name>2015-08-31 17:07:12 +0200
committerMark Brown <broonie@kernel.org>2015-08-31 17:08:50 +0200
commit6bd3c6f75e0f9baddbf1196a7e3fceabb50c7e3c (patch)
tree6bc56766bc7c9074942ed5bc12872eaef14ff6a1 /sound
parentASoC: fsl-asoc-card: add wm8960 support (diff)
downloadlinux-6bd3c6f75e0f9baddbf1196a7e3fceabb50c7e3c.tar.xz
linux-6bd3c6f75e0f9baddbf1196a7e3fceabb50c7e3c.zip
ASoC: fsl-asoc-card: put ASRC OF node in case of unknown device
In case of unknown DT compatible device the ASRC OF node possibly acquired earlier by of_parse_phandle() has to be put before returning from probe method. Signed-off-by: Maciej Szmigiero <mail@maciej.szmigiero.name> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/fsl/fsl-asoc-card.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/soc/fsl/fsl-asoc-card.c b/sound/soc/fsl/fsl-asoc-card.c
index 5aeb6ed4827e..96f55ae75c71 100644
--- a/sound/soc/fsl/fsl-asoc-card.c
+++ b/sound/soc/fsl/fsl-asoc-card.c
@@ -488,7 +488,8 @@ static int fsl_asoc_card_probe(struct platform_device *pdev)
priv->dai_fmt |= SND_SOC_DAIFMT_CBM_CFM;
} else {
dev_err(&pdev->dev, "unknown Device Tree compatible\n");
- return -EINVAL;
+ ret = -EINVAL;
+ goto asrc_fail;
}
/* Common settings for corresponding Freescale CPU DAI driver */