Merge tag 'v4.3-rc1' into locking/core, to refresh the tree

[firefly-linux-kernel-4.4.55.git] / arch / arm / mach-imx / pm-imx5.c

diff --git a/arch/arm/mach-imx/pm-imx5.c b/arch/arm/mach-imx/pm-imx5.c
index 1885676c23c08238d3ebb193de6239daf84a3e89..532d4b08276dc84c149b525e6fcc0a85d30a543b 100644 (file)
--- a/arch/arm/mach-imx/pm-imx5.c
+++ b/arch/arm/mach-imx/pm-imx5.c
@@ -297,7 +297,7 @@ static int __init imx_suspend_alloc_ocram(
                goto put_node;
        }
 
-       ocram_pool = gen_pool_get(&pdev->dev);
+       ocram_pool = gen_pool_get(&pdev->dev, NULL);
        if (!ocram_pool) {
                pr_warn("%s: ocram pool unavailable!\n", __func__);
                ret = -ENODEV;