Merge branch 'akpm' (incoming from Andrew)

[linux-beck.git] / drivers / video / exynos / exynos_dp_core.c

diff --git a/drivers/video/exynos/exynos_dp_core.c b/drivers/video/exynos/exynos_dp_core.c
index 4722234058ab8cc5d7c5b16443bd37492f05134d..de9d4da0e3daaf465966bb3837b42245acba2de4 100644 (file)
--- a/drivers/video/exynos/exynos_dp_core.c
+++ b/drivers/video/exynos/exynos_dp_core.c
@@ -1083,11 +1083,9 @@ static int exynos_dp_probe(struct platform_device *pdev)
 
        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
 
-       dp->reg_base = devm_request_and_ioremap(&pdev->dev, res);
-       if (!dp->reg_base) {
-               dev_err(&pdev->dev, "failed to ioremap\n");
-               return -ENOMEM;
-       }
+       dp->reg_base = devm_ioremap_resource(&pdev->dev, res);
+       if (IS_ERR(dp->reg_base))
+               return PTR_ERR(dp->reg_base);
 
        dp->irq = platform_get_irq(pdev, 0);
        if (dp->irq == -ENXIO) {