]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
[PATCH] skge: crash on shutdown/suspend
authorStephen Hemminger <shemminger@linux-foundation.org>
Tue, 15 May 2007 22:08:26 +0000 (15:08 -0700)
committerChris Wright <chrisw@sous-sol.org>
Wed, 23 May 2007 21:32:53 +0000 (14:32 -0700)
If device fails during module startup for some reason (like unsupported chip
version) then driver would crash dereferencing a null pointer, on shutdown
or suspend/resume.

Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
Signed-off-by: Chris Wright <chrisw@sous-sol.org>
drivers/net/skge.c

index 74c19c529d0237bb6cfb2a71147c29338847b020..5ef902390c6e1f7507131ea10e1f83a1509aaab0 100644 (file)
@@ -3794,6 +3794,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;
@@ -3822,6 +3825,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;
@@ -3860,6 +3866,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);