Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[karo-tx-linux.git] / drivers / gpu / drm / armada / armada_crtc.c

diff --git a/drivers/gpu/drm/armada/armada_crtc.c b/drivers/gpu/drm/armada/armada_crtc.c
index 81c34f949dfc63930125d85aec2687efba633958..3aedf9e993e65d8d3b8d67c8241d2e7a34b22990 100644 (file)
--- a/drivers/gpu/drm/armada/armada_crtc.c
+++ b/drivers/gpu/drm/armada/armada_crtc.c
@@ -1039,11 +1039,9 @@ int armada_drm_crtc_create(struct drm_device *dev, unsigned num,
        if (ret)
                return ret;
 
-       base = devm_request_and_ioremap(dev->dev, res);
-       if (!base) {
-               DRM_ERROR("failed to ioremap register\n");
-               return -ENOMEM;
-       }
+       base = devm_ioremap_resource(dev->dev, res);
+       if (IS_ERR(base))
+               return PTR_ERR(base);
 
        dcrtc = kzalloc(sizeof(*dcrtc), GFP_KERNEL);
        if (!dcrtc) {