---

yaml --- r: 356351 b: refs/heads/master c: 724c6ab h: refs/heads/master i: 356349: d320258 356347: c5b4012 356343: c287b1a 356335: 6d02074 356319: c9d4d90 356287: f58cc28 356223: 0741e65 356095: e047899 355839: 0cc6074 355327: ccd114e 354303: b1d2044 352255: 8f9982f v: v3
git-mirror · Jan 10, 2013 · 0d2f364 · 0d2f364
1 parent 0e3ce2f
commit 0d2f364
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6f79cb8134c5cd9f3346087906829013dce8d460
+refs/heads/master: 724c6abf29bcef1aae688f023b7d6dcb7eab0e68
diff --git a/trunk/arch/powerpc/platforms/pseries/pci.c b/trunk/arch/powerpc/platforms/pseries/pci.c
@@ -40,7 +40,8 @@ void pcibios_name_device(struct pci_dev *dev)
 	 */
 	dn = pci_device_to_OF_node(dev);
 	if (dn) {
-		const char *loc_code = of_get_property(dn, "ibm,loc-code", 0);
+		const char *loc_code = of_get_property(dn, "ibm,loc-code",
+				NULL);
 		if (loc_code) {
 			int loc_len = strlen(loc_code);
 			if (loc_len < sizeof(dev->dev.name)) {