diff options
| author | David S. Miller <davem@davemloft.net> | 2011-05-05 17:59:02 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-05-05 17:59:02 -0400 |
| commit | 7143b7d41218d4fc2ea33e6056c73609527ae687 (patch) | |
| tree | 9a842daee1deb57a2c8084bc5d300f6d8428fe34 /drivers/net/bnx2.c | |
| parent | 90864fbc7639d7a2300c67a18c9fb9fbcf7d51d2 (diff) | |
| parent | 87e9af6cc67d842cd92b52b81f3f14e665e7ab05 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/tg3.c
Diffstat (limited to 'drivers/net/bnx2.c')
| -rw-r--r-- | drivers/net/bnx2.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c index 1bebdfb9679f..57d3293c65bd 100644 --- a/drivers/net/bnx2.c +++ b/drivers/net/bnx2.c | |||
| @@ -8357,6 +8357,8 @@ bnx2_remove_one(struct pci_dev *pdev) | |||
| 8357 | 8357 | ||
| 8358 | unregister_netdev(dev); | 8358 | unregister_netdev(dev); |
| 8359 | 8359 | ||
| 8360 | del_timer_sync(&bp->timer); | ||
| 8361 | |||
| 8360 | if (bp->mips_firmware) | 8362 | if (bp->mips_firmware) |
| 8361 | release_firmware(bp->mips_firmware); | 8363 | release_firmware(bp->mips_firmware); |
| 8362 | if (bp->rv2p_firmware) | 8364 | if (bp->rv2p_firmware) |