Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux

[firefly-linux-kernel-4.4.55.git] / drivers / uio / uio_pdrv.c

diff --git a/drivers/uio/uio_pdrv.c b/drivers/uio/uio_pdrv.c
index 72d3646c73654958a19f99ae4ad00e5be0a46212..39be9e061700ded49d32e7e8ca9c5b2ad2d1590d 100644 (file)
--- 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)
                uiomem->memtype = UIO_MEM_PHYS;
                uiomem->addr = r->start;
                uiomem->size = resource_size(r);
+               uiomem->name = r->name;
                ++uiomem;
        }