diff options
| author |   Lorenzo Bianconi <lorenzo@kernel.org> | 2019-05-05 17:17:00 +0200 |
|---|---|---|
| committer |   Felix Fietkau <nbd@nbd.name> | 2019-06-25 12:55:27 +0200 |
| commit | 132191a8b8f4a2f038f71cce238b3ff8d90caba9 (patch) | |
| tree | 635e1e56fdd9e0bd93f01abbf0f9bea36ef45061 /drivers/net/wireless/mediatek | |
| parent | mt76: mt7603: stop mac80211 queues before setting the channel (diff) | |
| download | linux-dev-132191a8b8f4a2f038f71cce238b3ff8d90caba9.tar.xz linux-dev-132191a8b8f4a2f038f71cce238b3ff8d90caba9.zip | |
mt76: mt7615: rearrange cleanup operations in mt7615_unregister_device
Cleanup tx/rx napi before releasing pending idrs.
Moreover unmap txwi_cache running mt76_free_device routine
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Diffstat (limited to 'drivers/net/wireless/mediatek')
| -rw-r--r-- | drivers/net/wireless/mediatek/mt76/mt7615/init.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/init.c b/drivers/net/wireless/mediatek/mt76/mt7615/init.c index 3ab3ff553ef2..369b9a8e07be 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7615/init.c +++ b/drivers/net/wireless/mediatek/mt76/mt7615/init.c @@ -212,6 +212,10 @@ void mt7615_unregister_device(struct mt7615_dev *dev) struct mt76_txwi_cache *txwi; int id; + mt76_unregister_device(&dev->mt76); + mt7615_mcu_exit(dev); + mt7615_dma_cleanup(dev); + spin_lock_bh(&dev->token_lock); idr_for_each_entry(&dev->token, txwi, id) { mt7615_txp_skb_unmap(&dev->mt76, txwi); @@ -221,9 +225,6 @@ void mt7615_unregister_device(struct mt7615_dev *dev) } spin_unlock_bh(&dev->token_lock); idr_destroy(&dev->token); - mt76_unregister_device(&dev->mt76); - mt7615_mcu_exit(dev); - mt7615_dma_cleanup(dev); - ieee80211_free_hw(mt76_hw(dev)); + mt76_free_device(&dev->mt76); } |