diff options
| author |   Takashi Iwai <tiwai@suse.de> | 2013-02-16 15:48:48 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2013-02-16 15:48:48 +0100 |
| commit | c881f80ba8c50a1f7697dac360210337808d7774 (patch) | |
| tree | 1789ac393f37ba74e7a1b8d87851a08558ec78d6 /sound/soc/omap/omap-mcpdm.c | |
| parent | ALSA: au88x0 - Define channel map for au88x0 (diff) | |
| parent | Merge remote-tracking branch 'asoc/topic/da7213' into asoc-next (diff) | |
| download | linux-dev-c881f80ba8c50a1f7697dac360210337808d7774.tar.xz linux-dev-c881f80ba8c50a1f7697dac360210337808d7774.zip | |
Merge tag 'asoc-3.9-updates' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next
ASoC: Final updates for v3.9
A few more updates from the past week - a new driver from Dialog and
some small fixes and tweaks.
Diffstat (limited to 'sound/soc/omap/omap-mcpdm.c')
| -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; |