projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus-unmerged' of git://git.kernel.org/pub/scm/linux/kernel/git...
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
video
/
hpfb.c
diff --git
a/drivers/video/hpfb.c
b/drivers/video/hpfb.c
index c8e280f1bb0bf78181570a8d9b36956d55683ae6..ebf8495ff198b601220ee25b43545b4efe65b3b9 100644
(file)
--- a/
drivers/video/hpfb.c
+++ b/
drivers/video/hpfb.c
@@
-321,11
+321,11
@@
static int __devinit hpfb_dio_probe(struct dio_dev * d, const struct dio_device_
unsigned long paddr, vaddr;
paddr = d->resource.start;
unsigned long paddr, vaddr;
paddr = d->resource.start;
- if (!request_mem_region(d->resource.start,
d->resource.end - d->resource.start
, d->name))
+ if (!request_mem_region(d->resource.start,
resource_size(&d->resource)
, d->name))
return -EBUSY;
if (d->scode >= DIOII_SCBASE) {
return -EBUSY;
if (d->scode >= DIOII_SCBASE) {
- vaddr = (unsigned long)ioremap(paddr,
d->resource.end - d->resource.start
);
+ vaddr = (unsigned long)ioremap(paddr,
resource_size(&d->resource)
);
} else {
vaddr = paddr + DIO_VIRADDRBASE;
}
} else {
vaddr = paddr + DIO_VIRADDRBASE;
}
@@
-344,7
+344,7
@@
static void __devexit hpfb_remove_one(struct dio_dev *d)
unregister_framebuffer(&fb_info);
if (d->scode >= DIOII_SCBASE)
iounmap((void *)fb_regs);
unregister_framebuffer(&fb_info);
if (d->scode >= DIOII_SCBASE)
iounmap((void *)fb_regs);
-
release_mem_region(d->resource.start, d->resource.end - d->resource.start
);
+
release_mem_region(d->resource.start, resource_size(&d->resource)
);
}
static struct dio_device_id hpfb_dio_tbl[] = {
}
static struct dio_device_id hpfb_dio_tbl[] = {