From 0d2f364b8505d37b42a748d7b7f8a1712c859fdf Mon Sep 17 00:00:00 2001
From: Tushar Behera <tushar.behera@linaro.org>
Date: Mon, 19 Nov 2012 18:31:52 +0000
Subject: [PATCH] --- yaml --- r: 356351 b: refs/heads/master c:
 724c6abf29bcef1aae688f023b7d6dcb7eab0e68 h: refs/heads/master i:   356349:
 d3202586e577fc62dddea0f6c1c1d4b7117c9484   356347:
 c5b4012ede3235af47a660d49d122dea223eba54   356343:
 c287b1a36849e22c3fc064ea5b4cd02d307b58f4   356335:
 6d020742e8ea16fe50597db8d88bb1c2a993357b   356319:
 c9d4d9017ef0aae896fa2e9216adf722aafaba7f   356287:
 f58cc285d887cde25c03ed5055a9dbcbb35dfdb2   356223:
 0741e658e1968bcc77ec1915b2f4f95002c962f4   356095:
 e047899bc7cb5717f27d9d7172af692723a37da1   355839:
 0cc60748e257fa5ca7b1ffc3c4a2eb54169fdbdb   355327:
 ccd114e9823f0d5e49a62d8650eb47bfd03fa4fe   354303:
 b1d2044159cb213379827675f940654c0be5af94   352255:
 8f9982fdf3a441684b407ac383e32c34ca4877a0 v: v3

---
 [refs]                                     | 2 +-
 trunk/arch/powerpc/platforms/pseries/pci.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 38dc3876dd94..6e59da4214e6 100644
--- 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
index 56b864d777ee..0b580f413a9a 100644
--- 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)) {