Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux

[cascardo/linux.git] / drivers / gpu / drm / exynos / exynos_drm_g2d.c

diff --git a/drivers/gpu/drm/exynos/exynos_drm_g2d.c b/drivers/gpu/drm/exynos/exynos_drm_g2d.c
index 0fcfbe4..3b0da03 100644 (file)
--- a/drivers/gpu/drm/exynos/exynos_drm_g2d.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_g2d.c
@@ -1137,10 +1137,9 @@ static int g2d_probe(struct platform_device *pdev)
 
        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
 
-       g2d->regs = devm_request_and_ioremap(&pdev->dev, res);
-       if (!g2d->regs) {
-               dev_err(dev, "failed to remap I/O memory\n");
-               ret = -ENXIO;
+       g2d->regs = devm_ioremap_resource(&pdev->dev, res);
+       if (IS_ERR(g2d->regs)) {
+               ret = PTR_ERR(g2d->regs);
                goto err_put_clk;
        }