Skip to content

Commit

Permalink
imxfb: use resource_size() macro
Browse files Browse the repository at this point in the history
This fixes an off-by-one error. Also, use dev_err instead of printk
in probe() function.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
  • Loading branch information
Sascha Hauer committed Aug 7, 2009
1 parent f497d01 commit d6b5150
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions drivers/video/imxfb.c
Original file line number Diff line number Diff line change
Expand Up @@ -661,7 +661,7 @@ static int __init imxfb_probe(struct platform_device *pdev)
struct resource *res;
int ret;

printk("i.MX Framebuffer driver\n");
dev_info(&pdev->dev, "i.MX Framebuffer driver\n");

res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
if (!res)
Expand Down Expand Up @@ -701,7 +701,7 @@ static int __init imxfb_probe(struct platform_device *pdev)

fbi->regs = ioremap(res->start, resource_size(res));
if (fbi->regs == NULL) {
printk(KERN_ERR"Cannot map frame buffer registers\n");
dev_err(&pdev->dev, "Cannot map frame buffer registers\n");
goto failed_ioremap;
}

Expand Down Expand Up @@ -771,7 +771,7 @@ static int __init imxfb_probe(struct platform_device *pdev)
failed_getclock:
iounmap(fbi->regs);
failed_ioremap:
release_mem_region(res->start, res->end - res->start);
release_mem_region(res->start, resource_size(res));
failed_req:
kfree(info->pseudo_palette);
failed_init:
Expand Down Expand Up @@ -802,7 +802,7 @@ static int __devexit imxfb_remove(struct platform_device *pdev)
framebuffer_release(info);

iounmap(fbi->regs);
release_mem_region(res->start, res->end - res->start + 1);
release_mem_region(res->start, resource_size(res));
clk_disable(fbi->clk);
clk_put(fbi->clk);

Expand Down

0 comments on commit d6b5150

Please sign in to comment.