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

6be1cbfb · Mark Brown · 4f9a84fe · 41c4d554 · 6be1cbfb
Commit 6be1cbfb authored Feb 12, 2013 by Mark Brown
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

sound/soc/omap/omap-mcpdm.c sound/soc/omap/omap-mcpdm.c +0 -4

No files found.
--- a/sound/soc/omap/omap-mcpdm.c
+++ b/sound/soc/omap/omap-mcpdm.c
@@ -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;