summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@gmail.com>2010-11-08 13:24:58 +0800
committerMark Brown <broonie@opensource.wolfsonmicro.com>2010-11-08 16:28:33 +0000
commit1ebd0061ededeb8b495360a772d0b885dd3e036e (patch)
tree3e466229acfd77edcf541bc1fe238d7adaedb8cf
parent197ebd4053c42351e3737d83aebb33ed97ed2dd8 (diff)
downloadlinux-1ebd0061ededeb8b495360a772d0b885dd3e036e.tar.gz
linux-1ebd0061ededeb8b495360a772d0b885dd3e036e.tar.xz
ASoC: Return proper error if snd_soc_register_dais fails in psc_i2s_of_probe
Signed-off-by: Axel Lin <axel.lin@gmail.com> Acked-by: Liam Girdwood <lrg@slimlogic.co.uk> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
-rw-r--r--sound/soc/fsl/mpc5200_psc_i2s.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/fsl/mpc5200_psc_i2s.c b/sound/soc/fsl/mpc5200_psc_i2s.c
index 74ffed41340f..9018fa5bf0db 100644
--- a/sound/soc/fsl/mpc5200_psc_i2s.c
+++ b/sound/soc/fsl/mpc5200_psc_i2s.c
@@ -160,7 +160,7 @@ static int __devinit psc_i2s_of_probe(struct platform_device *op,
rc = snd_soc_register_dais(&op->dev, psc_i2s_dai, ARRAY_SIZE(psc_i2s_dai));
if (rc != 0) {
pr_err("Failed to register DAI\n");
- return 0;
+ return rc;
}
psc_dma = dev_get_drvdata(&op->dev);