diff options
| author | Guo-Fu Tseng <cooldavid@cooldavid.org> | 2009-07-06 04:37:52 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-07-06 13:04:59 -0700 |
| commit | 38ed0c2107dea55347504042ed4e1d0cbc3e9100 (patch) | |
| tree | f52538cf2ddf70276d7cbbda9556a9817c453b3b /drivers/net | |
| parent | eacf69a156dd068b3dfaa0aeb4874cda8633de87 (diff) | |
| download | op-kernel-dev-38ed0c2107dea55347504042ed4e1d0cbc3e9100.zip op-kernel-dev-38ed0c2107dea55347504042ed4e1d0cbc3e9100.tar.gz | |
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>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/jme.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/net/jme.c b/drivers/net/jme.c index abf82cd..8de3940 100644 --- a/drivers/net/jme.c +++ b/drivers/net/jme.c @@ -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); @@ -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); @@ -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); |
