From 430d0e5fdc2f1cd0a399d6c8fc53310629a9c41d Mon Sep 17 00:00:00 2001
From: Nikolay Aleksandrov <nikolay@redhat.com>
Date: Fri, 14 Sep 2012 05:50:03 +0000
Subject: [PATCH] --- yaml --- r: 323076 b: refs/heads/master c:
 e4d1aa40e363ed3e0486aeeeb0d173f7f822737e h: refs/heads/master v: v3

---
 [refs]                                                     | 2 +-
 trunk/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index f2e4eaef40a9..66586820cb52 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e488921f44765e8ab6c48ca35e3f6b78df9819df
+refs/heads/master: e4d1aa40e363ed3e0486aeeeb0d173f7f822737e
diff --git a/trunk/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c b/trunk/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c
index 342b3a79bd0f..a77c558d8f40 100644
--- a/trunk/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c
+++ b/trunk/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c
@@ -1378,6 +1378,10 @@ static void netxen_mask_aer_correctable(struct netxen_adapter *adapter)
 	struct pci_dev *root = pdev->bus->self;
 	u32 aer_pos;
 
+	/* root bus? */
+	if (!root)
+		return;
+
 	if (adapter->ahw.board_type != NETXEN_BRDTYPE_P3_4_GB_MM &&
 		adapter->ahw.board_type != NETXEN_BRDTYPE_P3_10G_TP)
 		return;