[patch 62/69] sky2: fix oops on shutdown
From: Chris Wright <hidden>
Date: 2007-05-21 19:33:32
Also in:
lkml
-stable review patch. If anyone has any objections, please let us know. --------------------- From: Stephen Hemminger <redacted> If the device fails during module startup for some reason like unsupported chip version then the driver would crash dereferencing a null pointer, on shutdown or suspend/resume. Signed-off-by: Stephen Hemminger <redacted> Signed-off-by: Chris Wright <redacted> --- drivers/net/sky2.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
--- linux-2.6.21.1.orig/drivers/net/sky2.c
+++ linux-2.6.21.1/drivers/net/sky2.c@@ -3719,6 +3719,7 @@ err_out_free_regions: pci_release_regions(pdev); pci_disable_device(pdev); err_out: + pci_set_drvdata(pdev, NULL); return err; }
@@ -3771,6 +3772,9 @@ static int sky2_suspend(struct pci_dev * 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]);
@@ -3802,6 +3806,9 @@ static int sky2_resume(struct pci_dev *p 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;
@@ -3848,6 +3855,9 @@ static void sky2_shutdown(struct pci_dev 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]);
--