summaryrefslogtreecommitdiffstats
path: root/sound/soc
diff options
context:
space:
mode:
authorFabio Estevam <fabio.estevam@nxp.com>2016-08-19 10:30:59 -0300
committerMark Brown <broonie@kernel.org>2016-08-19 15:20:05 +0100
commitc029695085145570eba12b6cf236954b42eb4fd5 (patch)
tree6dcace8fa811caa98097f6b0d7cc13fc94f46252 /sound/soc
parent6ea9c7ddd96d88e6cc391e63b5ed2fcfe41d5725 (diff)
downloadtalos-op-linux-c029695085145570eba12b6cf236954b42eb4fd5.tar.gz
talos-op-linux-c029695085145570eba12b6cf236954b42eb4fd5.zip
ASoC: fsl_asrc: Propagate the real error code
Instead of returning -EINVAL on error, return the real error code. Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc')
-rw-r--r--sound/soc/fsl/fsl_asrc.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/fsl/fsl_asrc.c b/sound/soc/fsl/fsl_asrc.c
index c1a0e01cb8e7..15f8ba5c5180 100644
--- a/sound/soc/fsl/fsl_asrc.c
+++ b/sound/soc/fsl/fsl_asrc.c
@@ -892,7 +892,7 @@ static int fsl_asrc_probe(struct platform_device *pdev)
ret = fsl_asrc_init(asrc_priv);
if (ret) {
dev_err(&pdev->dev, "failed to init asrc %d\n", ret);
- return -EINVAL;
+ return ret;
}
asrc_priv->channel_avail = 10;
@@ -901,14 +901,14 @@ static int fsl_asrc_probe(struct platform_device *pdev)
&asrc_priv->asrc_rate);
if (ret) {
dev_err(&pdev->dev, "failed to get output rate\n");
- return -EINVAL;
+ return ret;
}
ret = of_property_read_u32(np, "fsl,asrc-width",
&asrc_priv->asrc_width);
if (ret) {
dev_err(&pdev->dev, "failed to get output width\n");
- return -EINVAL;
+ return ret;
}
if (asrc_priv->asrc_width != 16 && asrc_priv->asrc_width != 24) {
OpenPOWER on IntegriCloud