Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev...

[platform/adaptation/renesas_rcar/renesas_kernel.git] / drivers / video / controlfb.c

diff --git a/drivers/video/controlfb.c b/drivers/video/controlfb.c
index f694401..7b2c40a 100644 (file)
--- a/drivers/video/controlfb.c
+++ b/drivers/video/controlfb.c
@@ -709,11 +709,11 @@ static int __init control_of_init(struct device_node *dp)
 
        /* Map in frame buffer and registers */
        p->fb_orig_base = fb_res.start;
-       p->fb_orig_size = fb_res.end - fb_res.start + 1;
+       p->fb_orig_size = resource_size(&fb_res);
        /* use the big-endian aperture (??) */
        p->frame_buffer_phys = fb_res.start + 0x800000;
        p->control_regs_phys = reg_res.start;
-       p->control_regs_size = reg_res.end - reg_res.start + 1;
+       p->control_regs_size = resource_size(&reg_res);
 
        if (!p->fb_orig_base ||
            !request_mem_region(p->fb_orig_base,p->fb_orig_size,"controlfb")) {