summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorChaithrika U S <chaithrika@ti.com>2009-06-08 12:49:41 +0200
committerMark Brown <broonie@opensource.wolfsonmicro.com>2009-06-08 15:55:12 +0200
commitefd13be09e2db4ac4efa2c6101c4f50ee1ead4b0 (patch)
tree0f5319c276c3b44713a1c6e55a9cd2be952d3091 /sound
parentASoC: Add machine driver support for DM646x (diff)
downloadlinux-efd13be09e2db4ac4efa2c6101c4f50ee1ead4b0.tar.xz
linux-efd13be09e2db4ac4efa2c6101c4f50ee1ead4b0.zip
ASoC: Minor fixes to DaVinci I2S probe function
Assign proper errors when platform resource claims fail. Signed-off-by: Chaithrika U S <chaithrika@ti.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/davinci/davinci-i2s.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/sound/soc/davinci/davinci-i2s.c b/sound/soc/davinci/davinci-i2s.c
index 500d2f574186..2f11970e6406 100644
--- a/sound/soc/davinci/davinci-i2s.c
+++ b/sound/soc/davinci/davinci-i2s.c
@@ -469,7 +469,7 @@ static int davinci_i2s_probe(struct platform_device *pdev)
struct snd_platform_data *pdata = pdev->dev.platform_data;
struct davinci_mcbsp_dev *dev;
struct resource *mem, *ioarea, *res;
- int ret = 0;
+ int ret;
mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
if (!mem) {
@@ -511,6 +511,7 @@ static int davinci_i2s_probe(struct platform_device *pdev)
res = platform_get_resource(pdev, IORESOURCE_DMA, 0);
if (!res) {
dev_err(&pdev->dev, "no DMA resource\n");
+ ret = -ENXIO;
goto err_free_mem;
}
dev->dma_params[SNDRV_PCM_STREAM_PLAYBACK]->channel = res->start;
@@ -518,6 +519,7 @@ static int davinci_i2s_probe(struct platform_device *pdev)
res = platform_get_resource(pdev, IORESOURCE_DMA, 1);
if (!res) {
dev_err(&pdev->dev, "no DMA resource\n");
+ ret = -ENXIO;
goto err_free_mem;
}
dev->dma_params[SNDRV_PCM_STREAM_CAPTURE]->channel = res->start;