diff options
| author | David S. Miller <davem@davemloft.net> | 2011-05-05 23:59:02 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-05-05 23:59:02 +0200 |
| commit | 7143b7d41218d4fc2ea33e6056c73609527ae687 (patch) | |
| tree | 9a842daee1deb57a2c8084bc5d300f6d8428fe34 /drivers/net/bnx2.c | |
| parent | Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/lin... (diff) | |
| parent | can: fix SJA1000 dlc for RTR packets (diff) | |
| download | linux-7143b7d41218d4fc2ea33e6056c73609527ae687.tar.xz linux-7143b7d41218d4fc2ea33e6056c73609527ae687.zip | |
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) unregister_netdev(dev); + del_timer_sync(&bp->timer); + if (bp->mips_firmware) release_firmware(bp->mips_firmware); if (bp->rv2p_firmware) |