提交 efd13be0 编写于 作者: C Chaithrika U S 提交者: Mark Brown

ASoC: Minor fixes to DaVinci I2S probe function

Assign proper errors when platform resource claims fail.
Signed-off-by: NChaithrika U S <chaithrika@ti.com>
Signed-off-by: NMark Brown <broonie@opensource.wolfsonmicro.com>
上级 04f80f5c
...@@ -469,7 +469,7 @@ static int davinci_i2s_probe(struct platform_device *pdev) ...@@ -469,7 +469,7 @@ static int davinci_i2s_probe(struct platform_device *pdev)
struct snd_platform_data *pdata = pdev->dev.platform_data; struct snd_platform_data *pdata = pdev->dev.platform_data;
struct davinci_mcbsp_dev *dev; struct davinci_mcbsp_dev *dev;
struct resource *mem, *ioarea, *res; struct resource *mem, *ioarea, *res;
int ret = 0; int ret;
mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
if (!mem) { if (!mem) {
...@@ -511,6 +511,7 @@ static int davinci_i2s_probe(struct platform_device *pdev) ...@@ -511,6 +511,7 @@ static int davinci_i2s_probe(struct platform_device *pdev)
res = platform_get_resource(pdev, IORESOURCE_DMA, 0); res = platform_get_resource(pdev, IORESOURCE_DMA, 0);
if (!res) { if (!res) {
dev_err(&pdev->dev, "no DMA resource\n"); dev_err(&pdev->dev, "no DMA resource\n");
ret = -ENXIO;
goto err_free_mem; goto err_free_mem;
} }
dev->dma_params[SNDRV_PCM_STREAM_PLAYBACK]->channel = res->start; dev->dma_params[SNDRV_PCM_STREAM_PLAYBACK]->channel = res->start;
...@@ -518,6 +519,7 @@ static int davinci_i2s_probe(struct platform_device *pdev) ...@@ -518,6 +519,7 @@ static int davinci_i2s_probe(struct platform_device *pdev)
res = platform_get_resource(pdev, IORESOURCE_DMA, 1); res = platform_get_resource(pdev, IORESOURCE_DMA, 1);
if (!res) { if (!res) {
dev_err(&pdev->dev, "no DMA resource\n"); dev_err(&pdev->dev, "no DMA resource\n");
ret = -ENXIO;
goto err_free_mem; goto err_free_mem;
} }
dev->dma_params[SNDRV_PCM_STREAM_CAPTURE]->channel = res->start; dev->dma_params[SNDRV_PCM_STREAM_CAPTURE]->channel = res->start;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册