aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video/pxafb.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/video/pxafb.c')
-rw-r--r--drivers/video/pxafb.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/video/pxafb.c b/drivers/video/pxafb.c
index 6506117c134b..0a301003d928 100644
--- a/drivers/video/pxafb.c
+++ b/drivers/video/pxafb.c
@@ -2091,14 +2091,14 @@ static int __devinit pxafb_probe(struct platform_device *dev)
2091 goto failed_fbi; 2091 goto failed_fbi;
2092 } 2092 }
2093 2093
2094 r = request_mem_region(r->start, r->end - r->start + 1, dev->name); 2094 r = request_mem_region(r->start, resource_size(r), dev->name);
2095 if (r == NULL) { 2095 if (r == NULL) {
2096 dev_err(&dev->dev, "failed to request I/O memory\n"); 2096 dev_err(&dev->dev, "failed to request I/O memory\n");
2097 ret = -EBUSY; 2097 ret = -EBUSY;
2098 goto failed_fbi; 2098 goto failed_fbi;
2099 } 2099 }
2100 2100
2101 fbi->mmio_base = ioremap(r->start, r->end - r->start + 1); 2101 fbi->mmio_base = ioremap(r->start, resource_size(r));
2102 if (fbi->mmio_base == NULL) { 2102 if (fbi->mmio_base == NULL) {
2103 dev_err(&dev->dev, "failed to map I/O memory\n"); 2103 dev_err(&dev->dev, "failed to map I/O memory\n");
2104 ret = -EBUSY; 2104 ret = -EBUSY;
@@ -2197,7 +2197,7 @@ failed_free_dma:
2197failed_free_io: 2197failed_free_io:
2198 iounmap(fbi->mmio_base); 2198 iounmap(fbi->mmio_base);
2199failed_free_res: 2199failed_free_res:
2200 release_mem_region(r->start, r->end - r->start + 1); 2200 release_mem_region(r->start, resource_size(r));
2201failed_fbi: 2201failed_fbi:
2202 clk_put(fbi->clk); 2202 clk_put(fbi->clk);
2203 platform_set_drvdata(dev, NULL); 2203 platform_set_drvdata(dev, NULL);
@@ -2237,7 +2237,7 @@ static int __devexit pxafb_remove(struct platform_device *dev)
2237 iounmap(fbi->mmio_base); 2237 iounmap(fbi->mmio_base);
2238 2238
2239 r = platform_get_resource(dev, IORESOURCE_MEM, 0); 2239 r = platform_get_resource(dev, IORESOURCE_MEM, 0);
2240 release_mem_region(r->start, r->end - r->start + 1); 2240 release_mem_region(r->start, resource_size(r));
2241 2241
2242 clk_put(fbi->clk); 2242 clk_put(fbi->clk);
2243 kfree(fbi); 2243 kfree(fbi);