Merge tag 'char-misc-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

[firefly-linux-kernel-4.4.55.git] / drivers / char / hw_random / exynos-rng.c

diff --git a/drivers/char/hw_random/exynos-rng.c b/drivers/char/hw_random/exynos-rng.c
index 2a4a86d97333081682c28851b11c7f0867645b3a..ac47631ab34f0caa0383853a0804a4ff4759e1d1 100644 (file)
--- a/drivers/char/hw_random/exynos-rng.c
+++ b/drivers/char/hw_random/exynos-rng.c
@@ -104,6 +104,7 @@ static int exynos_read(struct hwrng *rng, void *buf,
 static int exynos_rng_probe(struct platform_device *pdev)
 {
        struct exynos_rng *exynos_rng;
+       struct resource *res;
 
        exynos_rng = devm_kzalloc(&pdev->dev, sizeof(struct exynos_rng),
                                        GFP_KERNEL);
@@ -120,10 +121,10 @@ static int exynos_rng_probe(struct platform_device *pdev)
                return -ENOENT;
        }
 
-       exynos_rng->mem = devm_request_and_ioremap(&pdev->dev,
-                       platform_get_resource(pdev, IORESOURCE_MEM, 0));
-       if (!exynos_rng->mem)
-               return -EBUSY;
+       res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+       exynos_rng->mem = devm_ioremap_resource(&pdev->dev, res);
+       if (IS_ERR(exynos_rng->mem))
+               return PTR_ERR(exynos_rng->mem);
 
        platform_set_drvdata(pdev, exynos_rng);