diff options
author | Chaithrika U S <chaithrika@ti.com> | 2009-06-08 06:49:41 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-06-08 09:55:12 -0400 |
commit | efd13be09e2db4ac4efa2c6101c4f50ee1ead4b0 (patch) | |
tree | 0f5319c276c3b44713a1c6e55a9cd2be952d3091 | |
parent | 04f80f5c486b39446af44e218dba90ec210d61ca (diff) |
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>
-rw-r--r-- | sound/soc/davinci/davinci-i2s.c | 4 |
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) | |||
469 | struct snd_platform_data *pdata = pdev->dev.platform_data; | 469 | struct snd_platform_data *pdata = pdev->dev.platform_data; |
470 | struct davinci_mcbsp_dev *dev; | 470 | struct davinci_mcbsp_dev *dev; |
471 | struct resource *mem, *ioarea, *res; | 471 | struct resource *mem, *ioarea, *res; |
472 | int ret = 0; | 472 | int ret; |
473 | 473 | ||
474 | mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); | 474 | mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); |
475 | if (!mem) { | 475 | if (!mem) { |
@@ -511,6 +511,7 @@ static int davinci_i2s_probe(struct platform_device *pdev) | |||
511 | res = platform_get_resource(pdev, IORESOURCE_DMA, 0); | 511 | res = platform_get_resource(pdev, IORESOURCE_DMA, 0); |
512 | if (!res) { | 512 | if (!res) { |
513 | dev_err(&pdev->dev, "no DMA resource\n"); | 513 | dev_err(&pdev->dev, "no DMA resource\n"); |
514 | ret = -ENXIO; | ||
514 | goto err_free_mem; | 515 | goto err_free_mem; |
515 | } | 516 | } |
516 | dev->dma_params[SNDRV_PCM_STREAM_PLAYBACK]->channel = res->start; | 517 | dev->dma_params[SNDRV_PCM_STREAM_PLAYBACK]->channel = res->start; |
@@ -518,6 +519,7 @@ static int davinci_i2s_probe(struct platform_device *pdev) | |||
518 | res = platform_get_resource(pdev, IORESOURCE_DMA, 1); | 519 | res = platform_get_resource(pdev, IORESOURCE_DMA, 1); |
519 | if (!res) { | 520 | if (!res) { |
520 | dev_err(&pdev->dev, "no DMA resource\n"); | 521 | dev_err(&pdev->dev, "no DMA resource\n"); |
522 | ret = -ENXIO; | ||
521 | goto err_free_mem; | 523 | goto err_free_mem; |
522 | } | 524 | } |
523 | dev->dma_params[SNDRV_PCM_STREAM_CAPTURE]->channel = res->start; | 525 | dev->dma_params[SNDRV_PCM_STREAM_CAPTURE]->channel = res->start; |