Merge tag 'media/v4.3-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...

[karo-tx-linux.git] / drivers / media / platform / coda / coda-common.c

diff --git a/drivers/media/platform/coda/coda-common.c b/drivers/media/platform/coda/coda-common.c
index 04310cd35bc1a946100a2a8e658e6830361e86e9..a4654e0c104d40b0687718de478205f320d9facc 100644 (file)
--- a/drivers/media/platform/coda/coda-common.c
+++ b/drivers/media/platform/coda/coda-common.c
@@ -2181,7 +2181,7 @@ static int coda_probe(struct platform_device *pdev)
        /* Get IRAM pool from device tree or platform data */
        pool = of_gen_pool_get(np, "iram", 0);
        if (!pool && pdata)
-               pool = gen_pool_get(pdata->iram_dev);
+               pool = gen_pool_get(pdata->iram_dev, NULL);
        if (!pool) {
                dev_err(&pdev->dev, "iram pool not available\n");
                return -ENOMEM;