summaryrefslogtreecommitdiffstats
path: root/lib/devres.c
diff options
context:
space:
mode:
Diffstat (limited to 'lib/devres.c')
-rw-r--r--lib/devres.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/lib/devres.c b/lib/devres.c
index faccf1a037d0..69bed2f38306 100644
--- a/lib/devres.c
+++ b/lib/devres.c
@@ -134,7 +134,6 @@ EXPORT_SYMBOL(devm_iounmap);
134void __iomem *devm_ioremap_resource(struct device *dev, struct resource *res) 134void __iomem *devm_ioremap_resource(struct device *dev, struct resource *res)
135{ 135{
136 resource_size_t size; 136 resource_size_t size;
137 const char *name;
138 void __iomem *dest_ptr; 137 void __iomem *dest_ptr;
139 138
140 BUG_ON(!dev); 139 BUG_ON(!dev);
@@ -145,9 +144,8 @@ void __iomem *devm_ioremap_resource(struct device *dev, struct resource *res)
145 } 144 }
146 145
147 size = resource_size(res); 146 size = resource_size(res);
148 name = res->name ?: dev_name(dev);
149 147
150 if (!devm_request_mem_region(dev, res->start, size, name)) { 148 if (!devm_request_mem_region(dev, res->start, size, dev_name(dev))) {
151 dev_err(dev, "can't request region for resource %pR\n", res); 149 dev_err(dev, "can't request region for resource %pR\n", res);
152 return IOMEM_ERR_PTR(-EBUSY); 150 return IOMEM_ERR_PTR(-EBUSY);
153 } 151 }