diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2011-05-20 14:06:24 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2011-05-20 14:08:05 -0400 |
| commit | 250f972d85effad5b6e10da4bbd877e6a4b503b6 (patch) | |
| tree | 007393a6fc6439af7e0121dd99a6f9f9fb8405bc /drivers/net/bnx2.c | |
| parent | 7372b0b122af0f6675f3ab65bfd91c8a438e0480 (diff) | |
| parent | bbe7b8bef48c567f5ff3f6041c1fb011292e8f12 (diff) | |
Merge branch 'timers/urgent' into timers/core
Reason: Get upstream fixes and kfree_rcu which is necessary for a
follow up patch.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
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 8e6d618b5305..d8383a9af9ad 100644 --- a/drivers/net/bnx2.c +++ b/drivers/net/bnx2.c | |||
| @@ -8413,6 +8413,8 @@ bnx2_remove_one(struct pci_dev *pdev) | |||
| 8413 | 8413 | ||
| 8414 | unregister_netdev(dev); | 8414 | unregister_netdev(dev); |
| 8415 | 8415 | ||
| 8416 | del_timer_sync(&bp->timer); | ||
| 8417 | |||
| 8416 | if (bp->mips_firmware) | 8418 | if (bp->mips_firmware) |
| 8417 | release_firmware(bp->mips_firmware); | 8419 | release_firmware(bp->mips_firmware); |
| 8418 | if (bp->rv2p_firmware) | 8420 | if (bp->rv2p_firmware) |