diff options
| author | Manuel Traut <manut@linutronix.de> | 2012-11-09 01:06:40 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-11-15 20:29:07 -0500 |
| commit | ecd43c0d7e504fde69e6e53ac63adfd2feea135a (patch) | |
| tree | 5873eec6a3d1395a552e7d48e9af919880dc796e | |
| parent | 6e8bd6e727c5ec949194087ac6b593e1e7fe79c4 (diff) | |
uio_pdrv: set memory mapping name
If uio_pdrv[_genirq] is used, the uio maps have currently no name set.
This patch sets the uio_mem name to the name of the memory resource.
Signed-off-by: Manuel Traut <manut@linutronix.de>
Reported-by: Stefan Staedtler <stefan.staedtler@siemens.com>
Tested-by: Stefan Staedtler <stefan.staedtler@siemens.com>
Signed-off-by: "Hans J. Koch" <hjk@hansjkoch.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/uio/uio_pdrv.c | 1 | ||||
| -rw-r--r-- | drivers/uio/uio_pdrv_genirq.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/drivers/uio/uio_pdrv.c b/drivers/uio/uio_pdrv.c index 72d3646c7365..39be9e061700 100644 --- a/drivers/uio/uio_pdrv.c +++ b/drivers/uio/uio_pdrv.c | |||
| @@ -60,6 +60,7 @@ static int uio_pdrv_probe(struct platform_device *pdev) | |||
| 60 | uiomem->memtype = UIO_MEM_PHYS; | 60 | uiomem->memtype = UIO_MEM_PHYS; |
| 61 | uiomem->addr = r->start; | 61 | uiomem->addr = r->start; |
| 62 | uiomem->size = resource_size(r); | 62 | uiomem->size = resource_size(r); |
| 63 | uiomem->name = r->name; | ||
| 63 | ++uiomem; | 64 | ++uiomem; |
| 64 | } | 65 | } |
| 65 | 66 | ||
diff --git a/drivers/uio/uio_pdrv_genirq.c b/drivers/uio/uio_pdrv_genirq.c index 42202cd83158..ac988ce62f2b 100644 --- a/drivers/uio/uio_pdrv_genirq.c +++ b/drivers/uio/uio_pdrv_genirq.c | |||
| @@ -172,6 +172,7 @@ static int uio_pdrv_genirq_probe(struct platform_device *pdev) | |||
| 172 | uiomem->memtype = UIO_MEM_PHYS; | 172 | uiomem->memtype = UIO_MEM_PHYS; |
| 173 | uiomem->addr = r->start; | 173 | uiomem->addr = r->start; |
| 174 | uiomem->size = resource_size(r); | 174 | uiomem->size = resource_size(r); |
| 175 | uiomem->name = r->name; | ||
| 175 | ++uiomem; | 176 | ++uiomem; |
| 176 | } | 177 | } |
| 177 | 178 | ||
