diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2012-11-15 10:34:22 +0000 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2012-11-15 10:34:22 +0000 |
| commit | da63d20bfb12827dd7747a841ea27348af3abc0a (patch) | |
| tree | ba275a74d068f91b453c08b9bacf8afe9577db9b /drivers/net/ethernet/jme.c | |
| parent | 55020c8056a83ef2181e4cddd39cb2b9f4b88c5a (diff) | |
| parent | 77b67063bb6bce6d475e910d3b886a606d0d91f7 (diff) | |
| download | op-kernel-dev-da63d20bfb12827dd7747a841ea27348af3abc0a.zip op-kernel-dev-da63d20bfb12827dd7747a841ea27348af3abc0a.tar.gz | |
Merge tag 'v3.7-rc5' into devicetree/next
Linux 3.7-rc5
Diffstat (limited to 'drivers/net/ethernet/jme.c')
| -rw-r--r-- | drivers/net/ethernet/jme.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/ethernet/jme.c b/drivers/net/ethernet/jme.c index f8064df..92317e9 100644 --- a/drivers/net/ethernet/jme.c +++ b/drivers/net/ethernet/jme.c @@ -1948,10 +1948,10 @@ jme_close(struct net_device *netdev) JME_NAPI_DISABLE(jme); - tasklet_disable(&jme->linkch_task); - tasklet_disable(&jme->txclean_task); - tasklet_disable(&jme->rxclean_task); - tasklet_disable(&jme->rxempty_task); + tasklet_kill(&jme->linkch_task); + tasklet_kill(&jme->txclean_task); + tasklet_kill(&jme->rxclean_task); + tasklet_kill(&jme->rxempty_task); jme_disable_rx_engine(jme); jme_disable_tx_engine(jme); |
