Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...

[linux-drm-fsl-dcu.git] / drivers / media / platform / coda.c

diff --git a/drivers/media/platform/coda.c b/drivers/media/platform/coda.c
index ed4998c224f8f8956962711224cf1bac747e5eaa..bd72fb97fea5ab05924c4eeb4f5452534f3c3f46 100644 (file)
--- a/drivers/media/platform/coda.c
+++ b/drivers/media/platform/coda.c
@@ -3298,13 +3298,12 @@ static int coda_probe(struct platform_device *pdev)
                dev->iram_size = CODA7_IRAM_SIZE;
                break;
        }
-       dev->iram_vaddr = gen_pool_alloc(dev->iram_pool, dev->iram_size);
+       dev->iram_vaddr = (unsigned long)gen_pool_dma_alloc(dev->iram_pool,
+                       dev->iram_size, (dma_addr_t *)&dev->iram_paddr);
        if (!dev->iram_vaddr) {
                dev_err(&pdev->dev, "unable to alloc iram\n");
                return -ENOMEM;
        }
-       dev->iram_paddr = gen_pool_virt_to_phys(dev->iram_pool,
-                                               dev->iram_vaddr);
 
        platform_set_drvdata(pdev, dev);