diff options
author | Holger Eitzenberger <holger@eitzenberger.org> | 2010-11-17 10:43:52 -0500 |
---|---|---|
committer | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2010-12-11 01:13:01 -0500 |
commit | 9633e63bb1d82c02950983d5d3317e6656b11c8e (patch) | |
tree | fb13f79801a120a73a2e72c78c60df3cdc30ec44 /drivers/net/e1000e/netdev.c | |
parent | 9fe93afdd07aba52a018eb52784124579a80470e (diff) |
e1000e: fix double initialization in blink path
The kernel goes BUG() at the time 'ethtool -p eth0 3' comes
back, which is due to adapter->led_blink_task initialized
several times. At the time it is still running this results
in a corrupted task_list of the associated workqueue.
The fix is to move the workqueue initialization to the
probe function instead.
Signed-off-by: Holger Eitzenberger <holger@eitzenberger.org>
Reviewed-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Tested-by: Emil Tantilov <emil.s.tantilov@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to 'drivers/net/e1000e/netdev.c')
-rw-r--r-- | drivers/net/e1000e/netdev.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c index 0adcb79e6386..f8efbbbfddfb 100644 --- a/drivers/net/e1000e/netdev.c +++ b/drivers/net/e1000e/netdev.c | |||
@@ -5903,6 +5903,7 @@ static int __devinit e1000_probe(struct pci_dev *pdev, | |||
5903 | INIT_WORK(&adapter->downshift_task, e1000e_downshift_workaround); | 5903 | INIT_WORK(&adapter->downshift_task, e1000e_downshift_workaround); |
5904 | INIT_WORK(&adapter->update_phy_task, e1000e_update_phy_task); | 5904 | INIT_WORK(&adapter->update_phy_task, e1000e_update_phy_task); |
5905 | INIT_WORK(&adapter->print_hang_task, e1000_print_hw_hang); | 5905 | INIT_WORK(&adapter->print_hang_task, e1000_print_hw_hang); |
5906 | INIT_WORK(&adapter->led_blink_task, e1000e_led_blink_task); | ||
5906 | 5907 | ||
5907 | /* Initialize link parameters. User can change them with ethtool */ | 5908 | /* Initialize link parameters. User can change them with ethtool */ |
5908 | adapter->hw.mac.autoneg = 1; | 5909 | adapter->hw.mac.autoneg = 1; |