Commit 6be1cbfb authored by Mark Brown's avatar Mark Brown

Merge remote-tracking branch 'asoc/topic/omap' into asoc-next

parents 4f9a84fe 41c4d554
...@@ -449,10 +449,6 @@ static int asoc_mcpdm_probe(struct platform_device *pdev) ...@@ -449,10 +449,6 @@ static int asoc_mcpdm_probe(struct platform_device *pdev)
omap_mcpdm_dai_dma_params[0].port_addr = res->start + MCPDM_REG_DN_DATA; omap_mcpdm_dai_dma_params[0].port_addr = res->start + MCPDM_REG_DN_DATA;
omap_mcpdm_dai_dma_params[1].port_addr = res->start + MCPDM_REG_UP_DATA; omap_mcpdm_dai_dma_params[1].port_addr = res->start + MCPDM_REG_UP_DATA;
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
if (res == NULL)
return -ENOMEM;
res = platform_get_resource_byname(pdev, IORESOURCE_DMA, "dn_link"); res = platform_get_resource_byname(pdev, IORESOURCE_DMA, "dn_link");
if (!res) if (!res)
return -ENODEV; return -ENODEV;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment