Merge tag 'fbdev-3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux

[pandora-kernel.git] / drivers / video / xilinxfb.c

diff --git a/drivers/video/xilinxfb.c b/drivers/video/xilinxfb.c
index 6629b29..84c664e 100644 (file)
--- a/drivers/video/xilinxfb.c
+++ b/drivers/video/xilinxfb.c
@@ -259,12 +259,12 @@ static int xilinxfb_assign(struct platform_device *pdev,
                struct resource *res;
 
                res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-               drvdata->regs_phys = res->start;
-               drvdata->regs = devm_request_and_ioremap(&pdev->dev, res);
-               if (!drvdata->regs) {
-                       rc = -EADDRNOTAVAIL;
+               drvdata->regs = devm_ioremap_resource(&pdev->dev, res);
+               if (IS_ERR(drvdata->regs)) {
+                       rc = PTR_ERR(drvdata->regs);
                        goto err_region;
                }
+               drvdata->regs_phys = res->start;
        }
 
        /* Allocate the framebuffer memory */