There are several places in the SM501 fb driver that could do with using
resource_size() to calculate the size of a resource.
Also fix a bug where request_mem_region() is being passed one too few
bytes when requesting the register memory region, which was causing
the following in /proc/iomem:
13e80000-13e8ffff : sm501-fb.0
13e80000-13e8fffe : sm501-fb
fixed, this reads:
13e80000-13e8ffff : sm501-fb.0
13e80000-13e8ffff : sm501-fb
Signed-off-by: Ben Dooks <[email protected]>
Signed-off-by: Simtec Linux Team <[email protected]>
---
drivers/video/sm501fb.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
Index: b/drivers/video/sm501fb.c
===================================================================
--- a/drivers/video/sm501fb.c 2009-11-03 11:17:52.000000000 +0000
+++ b/drivers/video/sm501fb.c 2009-11-03 11:18:36.000000000 +0000
@@ -1338,7 +1338,7 @@ static int sm501fb_start(struct sm501fb_
}
info->regs_res = request_mem_region(res->start,
- res->end - res->start,
+ resource_size(res),
pdev->name);
if (info->regs_res == NULL) {
@@ -1347,7 +1347,7 @@ static int sm501fb_start(struct sm501fb_
goto err_release;
}
- info->regs = ioremap(res->start, (res->end - res->start)+1);
+ info->regs = ioremap(res->start, resource_size(res));
if (info->regs == NULL) {
dev_err(dev, "cannot remap registers\n");
ret = -ENXIO;
@@ -1363,7 +1363,7 @@ static int sm501fb_start(struct sm501fb_
}
info->fbmem_res = request_mem_region(res->start,
- (res->end - res->start)+1,
+ resource_size(res),
pdev->name);
if (info->fbmem_res == NULL) {
dev_err(dev, "cannot claim framebuffer\n");
@@ -1377,7 +1377,7 @@ static int sm501fb_start(struct sm501fb_
goto err_mem_res;
}
- info->fbmem_len = (res->end - res->start)+1;
+ info->fbmem_len = resource_size(res);
/* clear framebuffer memory - avoids garbage data on unused fb */
memset(info->fbmem, 0, info->fbmem_len);
--
Ben ([email protected], http://www.fluff.org/)
'a smiley only costs 4 bytes'
Could you attach the patch as a plain text in the body of email and
[PATCH] at the subject line?
On Tue, 10 Nov 2009 17:17:34 +0000
Ben Dooks <[email protected]> wrote:
> There are several places in the SM501 fb driver that could do with
> using resource_size() to calculate the size of a resource.
>
Yes, please! Also, as Thiago suggested, please submit this inline.
[...]
> @@ -1363,7 +1363,7 @@ static int sm501fb_start(struct sm501fb_
> }
>
> info->fbmem_res = request_mem_region(res->start,
> - (res->end -
> res->start)+1,
> + resource_size(res),
> pdev->name);
> if (info->fbmem_res == NULL) {
> dev_err(dev, "cannot claim framebuffer\n");
> @@ -1377,7 +1377,7 @@ static int sm501fb_start(struct sm501fb_
Looks like you missed one here; the ioremap on line 1374 should also
use resource_size.
> goto err_mem_res;
> }
>
> - info->fbmem_len = (res->end - res->start)+1;
> + info->fbmem_len = resource_size(res);
>
> /* clear framebuffer memory - avoids garbage data on unused
> fb */ memset(info->fbmem, 0, info->fbmem_len);
>
On Tue, Nov 10, 2009 at 03:36:05PM -0200, Thiago Farina wrote:
> Could you attach the patch as a plain text in the body of email and
quilt mail seems to work fine in my mailer.
[trimmed the cc: line]
--
Ben ([email protected], http://www.fluff.org/)
'a smiley only costs 4 bytes'
On Tue, Nov 10, 2009 at 01:15:36PM -0500, Andres Salomon wrote:
> On Tue, 10 Nov 2009 17:17:34 +0000
> Ben Dooks <[email protected]> wrote:
>
> > There are several places in the SM501 fb driver that could do with
> > using resource_size() to calculate the size of a resource.
> >
>
> Yes, please! Also, as Thiago suggested, please submit this inline.
My mailer shows it in line. using quilt mail to send, and it says
that the content has been inlined.
> [...]
> > @@ -1363,7 +1363,7 @@ static int sm501fb_start(struct sm501fb_
> > }
> >
> > info->fbmem_res = request_mem_region(res->start,
> > - (res->end -
> > res->start)+1,
> > + resource_size(res),
> > pdev->name);
> > if (info->fbmem_res == NULL) {
> > dev_err(dev, "cannot claim framebuffer\n");
> > @@ -1377,7 +1377,7 @@ static int sm501fb_start(struct sm501fb_
>
> Looks like you missed one here; the ioremap on line 1374 should also
> use resource_size.
thanks, fixed.
--
Ben ([email protected], http://www.fluff.org/)
'a smiley only costs 4 bytes'