Skip to content

Commit

Permalink
jme: Fix unmatched tasklet_{enable|disable} pair
Browse files Browse the repository at this point in the history
Fix faulty tasklet function usage.

Signed-off-by: Guo-Fu Tseng <cooldavid@cooldavid.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Guo-Fu Tseng authored and David S. Miller committed Jul 6, 2009
1 parent eacf69a commit 38ed0c2
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions drivers/net/jme.c
Original file line number Diff line number Diff line change
Expand Up @@ -1566,6 +1566,7 @@ jme_open(struct net_device *netdev)
jme_clear_pm(jme);
JME_NAPI_ENABLE(jme);

tasklet_enable(&jme->linkch_task);
tasklet_enable(&jme->txclean_task);
tasklet_hi_enable(&jme->rxclean_task);
tasklet_hi_enable(&jme->rxempty_task);
Expand Down Expand Up @@ -1647,10 +1648,10 @@ jme_close(struct net_device *netdev)

JME_NAPI_DISABLE(jme);

tasklet_kill(&jme->linkch_task);
tasklet_kill(&jme->txclean_task);
tasklet_kill(&jme->rxclean_task);
tasklet_kill(&jme->rxempty_task);
tasklet_disable(&jme->linkch_task);
tasklet_disable(&jme->txclean_task);
tasklet_disable(&jme->rxclean_task);
tasklet_disable(&jme->rxempty_task);

jme_reset_ghc_speed(jme);
jme_disable_rx_engine(jme);
Expand Down Expand Up @@ -2768,6 +2769,7 @@ jme_init_one(struct pci_dev *pdev,
tasklet_init(&jme->rxempty_task,
&jme_rx_empty_tasklet,
(unsigned long) jme);
tasklet_disable_nosync(&jme->linkch_task);
tasklet_disable_nosync(&jme->txclean_task);
tasklet_disable_nosync(&jme->rxclean_task);
tasklet_disable_nosync(&jme->rxempty_task);
Expand Down

0 comments on commit 38ed0c2

Please sign in to comment.