aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuo-Fu Tseng <cooldavid@cooldavid.org>2009-07-06 00:37:52 -0400
committerDavid S. Miller <davem@davemloft.net>2009-07-06 16:04:59 -0400
commit38ed0c2107dea55347504042ed4e1d0cbc3e9100 (patch)
treef52538cf2ddf70276d7cbbda9556a9817c453b3b
parenteacf69a156dd068b3dfaa0aeb4874cda8633de87 (diff)
jme: Fix unmatched tasklet_{enable|disable} pair
Fix faulty tasklet function usage. Signed-off-by: Guo-Fu Tseng <cooldavid@cooldavid.org> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/jme.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/net/jme.c b/drivers/net/jme.c
index abf82cd2d7c3..8de394021a5e 100644
--- a/drivers/net/jme.c
+++ b/drivers/net/jme.c
@@ -1566,6 +1566,7 @@ jme_open(struct net_device *netdev)
1566 jme_clear_pm(jme); 1566 jme_clear_pm(jme);
1567 JME_NAPI_ENABLE(jme); 1567 JME_NAPI_ENABLE(jme);
1568 1568
1569 tasklet_enable(&jme->linkch_task);
1569 tasklet_enable(&jme->txclean_task); 1570 tasklet_enable(&jme->txclean_task);
1570 tasklet_hi_enable(&jme->rxclean_task); 1571 tasklet_hi_enable(&jme->rxclean_task);
1571 tasklet_hi_enable(&jme->rxempty_task); 1572 tasklet_hi_enable(&jme->rxempty_task);
@@ -1647,10 +1648,10 @@ jme_close(struct net_device *netdev)
1647 1648
1648 JME_NAPI_DISABLE(jme); 1649 JME_NAPI_DISABLE(jme);
1649 1650
1650 tasklet_kill(&jme->linkch_task); 1651 tasklet_disable(&jme->linkch_task);
1651 tasklet_kill(&jme->txclean_task); 1652 tasklet_disable(&jme->txclean_task);
1652 tasklet_kill(&jme->rxclean_task); 1653 tasklet_disable(&jme->rxclean_task);
1653 tasklet_kill(&jme->rxempty_task); 1654 tasklet_disable(&jme->rxempty_task);
1654 1655
1655 jme_reset_ghc_speed(jme); 1656 jme_reset_ghc_speed(jme);
1656 jme_disable_rx_engine(jme); 1657 jme_disable_rx_engine(jme);
@@ -2768,6 +2769,7 @@ jme_init_one(struct pci_dev *pdev,
2768 tasklet_init(&jme->rxempty_task, 2769 tasklet_init(&jme->rxempty_task,
2769 &jme_rx_empty_tasklet, 2770 &jme_rx_empty_tasklet,
2770 (unsigned long) jme); 2771 (unsigned long) jme);
2772 tasklet_disable_nosync(&jme->linkch_task);
2771 tasklet_disable_nosync(&jme->txclean_task); 2773 tasklet_disable_nosync(&jme->txclean_task);
2772 tasklet_disable_nosync(&jme->rxclean_task); 2774 tasklet_disable_nosync(&jme->rxclean_task);
2773 tasklet_disable_nosync(&jme->rxempty_task); 2775 tasklet_disable_nosync(&jme->rxempty_task);