1 files changed, 18 insertions, 4 deletions

diff --git a/drivers/net/skge.c b/drivers/net/skge.c
index 21afe108d3cb..776692946562 100644
--- a/drivers/net/skge.c
+++ b/drivers/net/skge.c
@@ -135,10 +135,13 @@ static void skge_get_regs(struct net_device *dev, struct ethtool_regs *regs,
 /* Wake on Lan only supported on Yukon chips with rev 1 or above */
 static u32 wol_supported(const struct skge_hw *hw)
 {
-        if (hw->chip_id == CHIP_ID_YUKON && hw->chip_rev != 0)
-                return WAKE_MAGIC | WAKE_PHY;
-        else
+        if (hw->chip_id == CHIP_ID_GENESIS)
+                return 0;
+
+        if (hw->chip_id == CHIP_ID_YUKON && hw->chip_rev == 0)
                 return 0;
+
+        return WAKE_MAGIC | WAKE_PHY;
 }
 
 static u32 pci_wake_enabled(struct pci_dev *dev)
@@ -3591,7 +3594,9 @@ static struct net_device *skge_devinit(struct skge_hw *hw, int port,
         skge->duplex = -1;
         skge->speed = -1;
         skge->advertising = skge_supported_modes(hw);
-        skge->wol = pci_wake_enabled(hw->pdev) ? wol_supported(hw) : 0;
+
+        if (pci_wake_enabled(hw->pdev))
+                skge->wol = wol_supported(hw) & WAKE_MAGIC;
 
         hw->dev[port] = dev;
 
@@ -3797,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;
@@ -3825,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;
@@ -3863,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);