Merge commit 'v3.1-rc1' into imx-fixes

[firefly-linux-kernel-4.4.55.git] / drivers / video / platinumfb.c

diff --git a/drivers/video/platinumfb.c b/drivers/video/platinumfb.c
index ef532d9d3c99d9376e8c5c260eda261f46c203c5..f27ae16ead2ea1671e782821a1f6836140120ee7 100644 (file)
--- a/drivers/video/platinumfb.c
+++ b/drivers/video/platinumfb.c
@@ -567,7 +567,7 @@ static int __devinit platinumfb_probe(struct platform_device* odev)
         * northbridge and that can fail. Only request framebuffer
         */
        if (!request_mem_region(pinfo->rsrc_fb.start,
-                               pinfo->rsrc_fb.end - pinfo->rsrc_fb.start + 1,
+                               resource_size(&pinfo->rsrc_fb),
                                "platinumfb framebuffer")) {
                printk(KERN_ERR "platinumfb: Can't request framebuffer !\n");
                framebuffer_release(info);
@@ -658,8 +658,7 @@ static int __devexit platinumfb_remove(struct platform_device* odev)
        iounmap(pinfo->cmap_regs);
 
        release_mem_region(pinfo->rsrc_fb.start,
-                          pinfo->rsrc_fb.end -
-                          pinfo->rsrc_fb.start + 1);
+                          resource_size(&pinfo->rsrc_fb));
 
        release_mem_region(pinfo->cmap_regs_phys, 0x1000);