Merge branch 'drm-intel-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/keith...

[karo-tx-linux.git] / drivers / video / sh7760fb.c

diff --git a/drivers/video/sh7760fb.c b/drivers/video/sh7760fb.c
index bea38fce2470298f4bf27345ab72b0007abb260b..8fe19582c4602f65badeb17fbccb930574e243dc 100644 (file)
--- a/drivers/video/sh7760fb.c
+++ b/drivers/video/sh7760fb.c
@@ -459,14 +459,14 @@ static int __devinit sh7760fb_probe(struct platform_device *pdev)
        }
 
        par->ioarea = request_mem_region(res->start,
-                                        (res->end - res->start), pdev->name);
+                                        resource_size(res), pdev->name);
        if (!par->ioarea) {
                dev_err(&pdev->dev, "mmio area busy\n");
                ret = -EBUSY;
                goto out_fb;
        }
 
-       par->base = ioremap_nocache(res->start, res->end - res->start + 1);
+       par->base = ioremap_nocache(res->start, resource_size(res));
        if (!par->base) {
                dev_err(&pdev->dev, "cannot remap\n");
                ret = -ENODEV;