aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorMark Brown2013-02-12 16:19:04 -0600
committerMark Brown2013-02-12 16:19:04 -0600
commit6be1cbfb784b508947de2c7b0fb2ba4afb163aca (patch)
treec9546d0ab2cfc8d867407713a3890f08332ab5e3 /sound
parent4f9a84fea0b49ec48dc8bfe745d838d6f9ed2a20 (diff)
parent41c4d554e75ccbdb043878049cf2671dd49598a5 (diff)
downloadam43-linux-kernel-6be1cbfb784b508947de2c7b0fb2ba4afb163aca.tar.gz
am43-linux-kernel-6be1cbfb784b508947de2c7b0fb2ba4afb163aca.tar.xz
am43-linux-kernel-6be1cbfb784b508947de2c7b0fb2ba4afb163aca.zip
Merge remote-tracking branch 'asoc/topic/omap' into asoc-next
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/omap/omap-mcpdm.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/sound/soc/omap/omap-mcpdm.c b/sound/soc/omap/omap-mcpdm.c
index 2fe8be20945..5ca11bdac21 100644
--- 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)
449 omap_mcpdm_dai_dma_params[0].port_addr = res->start + MCPDM_REG_DN_DATA; 449 omap_mcpdm_dai_dma_params[0].port_addr = res->start + MCPDM_REG_DN_DATA;
450 omap_mcpdm_dai_dma_params[1].port_addr = res->start + MCPDM_REG_UP_DATA; 450 omap_mcpdm_dai_dma_params[1].port_addr = res->start + MCPDM_REG_UP_DATA;
451 451
452 res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
453 if (res == NULL)
454 return -ENOMEM;
455
456 res = platform_get_resource_byname(pdev, IORESOURCE_DMA, "dn_link"); 452 res = platform_get_resource_byname(pdev, IORESOURCE_DMA, "dn_link");
457 if (!res) 453 if (!res)
458 return -ENODEV; 454 return -ENODEV;