summaryrefslogtreecommitdiffstats
path: root/drivers/uio
diff options
context:
space:
mode:
authorJan Viktorin <viktorin@rehivetech.com>2016-05-17 11:22:17 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-08-31 13:07:30 +0200
commit4d31a2588ae37a5d0f61f4d956454e9504846aeb (patch)
tree7047c4a9d08ae2753a680da5b5ed4596a714b373 /drivers/uio
parente97b1c6a8dba967a7c272c3b976ed6d59c7bfad7 (diff)
downloadlinux-4d31a2588ae37a5d0f61f4d956454e9504846aeb.tar.bz2
uio: fix dmem_region_start computation
The variable i contains a total number of resources (including IORESOURCE_IRQ). However, we want the dmem_region_start to point after the last resource of type IORESOURCE_MEM. The original behaviour leads (very likely) to skipping several UIO mapping regions and makes them useless. Fix this by computing dmem_region_start from the uiomem which points to the last used UIO mapping. Fixes: 0a0c3b5a24bd ("Add new uio device for dynamic memory allocation") Signed-off-by: Jan Viktorin <viktorin@rehivetech.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/uio')
-rw-r--r--drivers/uio/uio_dmem_genirq.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/uio/uio_dmem_genirq.c b/drivers/uio/uio_dmem_genirq.c
index 915facbf552e..e1134a4d97f3 100644
--- a/drivers/uio/uio_dmem_genirq.c
+++ b/drivers/uio/uio_dmem_genirq.c
@@ -229,7 +229,7 @@ static int uio_dmem_genirq_probe(struct platform_device *pdev)
++uiomem;
}
- priv->dmem_region_start = i;
+ priv->dmem_region_start = uiomem - &uioinfo->mem[0];
priv->num_dmem_regions = pdata->num_dynamic_regions;
for (i = 0; i < pdata->num_dynamic_regions; ++i) {