From 2eec0e582d81047e71dd59b1c34f6ddaec85d274 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Fri, 11 May 2007 11:21:44 -0700 Subject: [PATCH] --- yaml --- r: 56229 b: refs/heads/master c: 549a68c3fe2ca320b0764d1289d17af797daa5d1 h: refs/heads/master i: 56227: de0fa16cef733b541ab783668876150106de447c v: v3 --- [refs] | 2 +- trunk/drivers/net/sky2.c | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 0e3fd8d39fbe..f1a2b155a4fc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4093785dd16d0b7058eb92331bfd7b40b12151f3 +refs/heads/master: 549a68c3fe2ca320b0764d1289d17af797daa5d1 diff --git a/trunk/drivers/net/sky2.c b/trunk/drivers/net/sky2.c index a307310f13f5..3764008270a2 100644 --- a/trunk/drivers/net/sky2.c +++ b/trunk/drivers/net/sky2.c @@ -3732,6 +3732,7 @@ static int __devinit sky2_probe(struct pci_dev *pdev, err_out_disable: pci_disable_device(pdev); err_out: + pci_set_drvdata(pdev, NULL); return err; } @@ -3784,6 +3785,9 @@ static int sky2_suspend(struct pci_dev *pdev, pm_message_t state) struct sky2_hw *hw = pci_get_drvdata(pdev); int i, wol = 0; + if (!hw) + return 0; + del_timer_sync(&hw->idle_timer); netif_poll_disable(hw->dev[0]); @@ -3815,6 +3819,9 @@ static int sky2_resume(struct pci_dev *pdev) struct sky2_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; @@ -3861,6 +3868,9 @@ static void sky2_shutdown(struct pci_dev *pdev) struct sky2_hw *hw = pci_get_drvdata(pdev); int i, wol = 0; + if (!hw) + return; + del_timer_sync(&hw->idle_timer); netif_poll_disable(hw->dev[0]);