git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
[pandora-kernel.git]
/
drivers
/
uio
/
uio_pdrv.c
diff --git
a/drivers/uio/uio_pdrv.c
b/drivers/uio/uio_pdrv.c
index
7d3e469
..
bdc3db9
100644
(file)
--- a/
drivers/uio/uio_pdrv.c
+++ b/
drivers/uio/uio_pdrv.c
@@
-58,7
+58,7
@@
static int uio_pdrv_probe(struct platform_device *pdev)
uiomem->memtype = UIO_MEM_PHYS;
uiomem->addr = r->start;
- uiomem->size = r
->end - r->start + 1
;
+ uiomem->size = r
esource_size(r)
;
++uiomem;
}