Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6

[~andy/linux] / drivers / uio / uio_pdrv.c

diff --git a/drivers/uio/uio_pdrv.c b/drivers/uio/uio_pdrv.c
index 7d3e469b99045be5ad1ff6e0dfecc4dd1870d50e..bdc3db946122f425a13b2cf619e61d3acbcae622 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 = resource_size(r);
                ++uiomem;
        }