Skip to content

Commit

Permalink
Merge remote-tracking branch 'asoc/topic/omap' into asoc-next
Browse files Browse the repository at this point in the history
  • Loading branch information
Mark Brown committed Feb 12, 2013
2 parents 4f9a84f + 41c4d55 commit 6be1cbf
Showing 1 changed file with 0 additions and 4 deletions.
4 changes: 0 additions & 4 deletions sound/soc/omap/omap-mcpdm.c
Original file line number Diff line number Diff line change
Expand Up @@ -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[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");
if (!res)
return -ENODEV;
Expand Down

0 comments on commit 6be1cbf

Please sign in to comment.