---

yaml --- r: 204895 b: refs/heads/master c: d3571c3 h: refs/heads/master i: 204893: 6877442 204891: 0e69baf 204887: 47730b3 204879: 7a992f4 204863: a56e24a v: v3
git-mirror · Jul 5, 2010 · d0578a5 · d0578a5
1 parent 8960c10
commit d0578a5
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3930f294d081c9e2a65f137a7d5fb6c161e4aa94
+refs/heads/master: d3571c3acfabb6f3a93b517b75d9b30eb7e8692e
diff --git a/trunk/drivers/of/address.c b/trunk/drivers/of/address.c
@@ -549,7 +549,7 @@ static int __of_address_to_resource(struct device_node *dev, const u32 *addrp,
 		r->end = taddr + size - 1;
 	}
 	r->flags = flags;
-	r->name = dev->name;
+	r->name = dev->full_name;
 	return 0;
 }
 

diff --git a/trunk/drivers/of/irq.c b/trunk/drivers/of/irq.c
@@ -340,6 +340,7 @@ int of_irq_to_resource(struct device_node *dev, int index, struct resource *r)
 	if (r && irq != NO_IRQ) {
 		r->start = r->end = irq;
 		r->flags = IORESOURCE_IRQ;
+		r->name = dev->full_name;
 	}
 
 	return irq;