-stable review patch. If anyone has any objections, please let us know. --------------------- From: Stephen Hemminger 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 Signed-off-by: Chris Wright --- drivers/net/skge.c | 9 +++++++++ 1 file changed, 9 insertions(+) --- linux-2.6.21.1.orig/drivers/net/skge.c +++ linux-2.6.21.1/drivers/net/skge.c @@ -3794,6 +3794,9 @@ static int skge_suspend(struct pci_dev * 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 *p 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 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); -- - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/