From 9c5195ca9f2358408172ed312ea55d5dc59205bb Mon Sep 17 00:00:00 2001
From: Olof Johansson <olof@lixom.net>
Date: Thu, 8 Sep 2011 18:11:46 -0700
Subject: [PATCH] --- yaml --- r: 272637 b: refs/heads/master c:
 31e660685ddf6ca3686519b966f289f0f83f7780 h: refs/heads/master i:   272635:
 8b899a5e3b3b615f4c5b8720aff8802a9d75c126 v: v3

---
 [refs]                           | 2 +-
 trunk/arch/arm/mach-tegra/pcie.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index ed3ba64e1581..4a8f585b2777 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3ead5137c2ceee39901415084e7ca3ab04d01970
+refs/heads/master: 31e660685ddf6ca3686519b966f289f0f83f7780
diff --git a/trunk/arch/arm/mach-tegra/pcie.c b/trunk/arch/arm/mach-tegra/pcie.c
index f7c89ee5a7e2..f5aa173c26b3 100644
--- a/trunk/arch/arm/mach-tegra/pcie.c
+++ b/trunk/arch/arm/mach-tegra/pcie.c
@@ -462,7 +462,7 @@ static struct pci_bus __init *tegra_pcie_scan_bus(int nr,
 	struct tegra_pcie_port *pp;
 
 	if (nr >= tegra_pcie.num_ports)
-		return 0;
+		return NULL;
 
 	pp = tegra_pcie.port + nr;
 	pp->root_bus_nr = sys->busnr;