Commit 3ab4b298 authored by Jan Viktorin's avatar Jan Viktorin Committed by Ben Hutchings

uio: fix dmem_region_start computation

commit 4d31a258 upstream.

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: 0a0c3b5a ("Add new uio device for dynamic memory allocation")
Signed-off-by: default avatarJan Viktorin <viktorin@rehivetech.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarBen Hutchings <ben@decadent.org.uk>
parent 73776646
...@@ -229,7 +229,7 @@ static int uio_dmem_genirq_probe(struct platform_device *pdev) ...@@ -229,7 +229,7 @@ static int uio_dmem_genirq_probe(struct platform_device *pdev)
++uiomem; ++uiomem;
} }
priv->dmem_region_start = i; priv->dmem_region_start = uiomem - &uioinfo->mem[0];
priv->num_dmem_regions = pdata->num_dynamic_regions; priv->num_dmem_regions = pdata->num_dynamic_regions;
for (i = 0; i < pdata->num_dynamic_regions; ++i) { for (i = 0; i < pdata->num_dynamic_regions; ++i) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment