---

yaml --- r: 323076 b: refs/heads/master c: e4d1aa4 h: refs/heads/master v: v3
git-mirror · Sep 18, 2012 · 430d0e5 · 430d0e5
1 parent 994f81a
commit 430d0e5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git 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
@@ -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;