Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[karo-tx-linux.git] / sound / soc / omap / omap-dmic.c

diff --git a/sound/soc/omap/omap-dmic.c b/sound/soc/omap/omap-dmic.c
index 2ad0370146fda408ad40fc1d992fe3cd8a12d0f6..4db1f8e6e17268e042555fcae6f732d17fed7946 100644 (file)
--- a/sound/soc/omap/omap-dmic.c
+++ b/sound/soc/omap/omap-dmic.c
@@ -57,7 +57,6 @@ struct omap_dmic {
        struct mutex mutex;
 
        struct snd_dmaengine_dai_dma_data dma_data;
-       unsigned int dma_req;
 };
 
 static inline void omap_dmic_write(struct omap_dmic *dmic, u16 reg, u32 val)
@@ -478,15 +477,7 @@ static int asoc_dmic_probe(struct platform_device *pdev)
        }
        dmic->dma_data.addr = res->start + OMAP_DMIC_DATA_REG;
 
-       res = platform_get_resource(pdev, IORESOURCE_DMA, 0);
-       if (!res) {
-               dev_err(dmic->dev, "invalid dma resource\n");
-               ret = -ENODEV;
-               goto err_put_clk;
-       }
-
-       dmic->dma_req = res->start;
-       dmic->dma_data.filter_data = &dmic->dma_req;
+       dmic->dma_data.filter_data = "up_link";
 
        res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "mpu");
        if (!res) {