From 2b96b07ba0e95f1bf60f8abf735241da28b5cc81 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <shemminger@linux-foundation.org>
Date: Fri, 11 May 2007 11:21:45 -0700
Subject: [PATCH] --- yaml --- r: 56230 b: refs/heads/master c:
 e3b7df17c8344fbcc00e871e03f5f88d58905277 h: refs/heads/master v: v3

---
 [refs]                   | 2 +-
 trunk/drivers/net/skge.c | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index f1a2b155a4fc..abdd6c5c369e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 549a68c3fe2ca320b0764d1289d17af797daa5d1
+refs/heads/master: e3b7df17c8344fbcc00e871e03f5f88d58905277
diff --git a/trunk/drivers/net/skge.c b/trunk/drivers/net/skge.c
index e0489578945d..776692946562 100644
--- a/trunk/drivers/net/skge.c
+++ b/trunk/drivers/net/skge.c
@@ -3802,6 +3802,9 @@ static int skge_suspend(struct pci_dev *pdev, pm_message_t state)
 	struct skge_hw *hw  = pci_get_drvdata(pdev);
 	int i, err, wol = 0;
 
+	if (!hw)
+		return 0;
+
 	err = pci_save_state(pdev);
 	if (err)
 		return err;
@@ -3830,6 +3833,9 @@ static int skge_resume(struct pci_dev *pdev)
 	struct skge_hw *hw  = pci_get_drvdata(pdev);
 	int i, err;
 
+	if (!hw)
+		return 0;
+
 	err = pci_set_power_state(pdev, PCI_D0);
 	if (err)
 		goto out;
@@ -3868,6 +3874,9 @@ static void skge_shutdown(struct pci_dev *pdev)
 	struct skge_hw *hw  = pci_get_drvdata(pdev);
 	int i, wol = 0;
 
+	if (!hw)
+		return;
+
 	for (i = 0; i < hw->ports; i++) {
 		struct net_device *dev = hw->dev[i];
 		struct skge_port *skge = netdev_priv(dev);