diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-02-12 22:19:04 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-02-12 22:19:04 +0000 |
| commit | 6be1cbfb784b508947de2c7b0fb2ba4afb163aca (patch) | |
| tree | c9546d0ab2cfc8d867407713a3890f08332ab5e3 /sound | |
| parent | 4f9a84fea0b49ec48dc8bfe745d838d6f9ed2a20 (diff) | |
| parent | 41c4d554e75ccbdb043878049cf2671dd49598a5 (diff) | |
| download | linux-stable-6be1cbfb784b508947de2c7b0fb2ba4afb163aca.tar.gz linux-stable-6be1cbfb784b508947de2c7b0fb2ba4afb163aca.tar.bz2 linux-stable-6be1cbfb784b508947de2c7b0fb2ba4afb163aca.zip | |
Merge remote-tracking branch 'asoc/topic/omap' into asoc-next
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/omap/omap-mcpdm.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/sound/soc/omap/omap-mcpdm.c b/sound/soc/omap/omap-mcpdm.c index 2fe8be209452..5ca11bdac21e 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) 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; |