From: Bo Jiao Date: Sat, 7 May 2022 01:21:21 +0000 (+0800) Subject: mt76: mt7615/mt7915: do reset_work with mt76's work queue X-Git-Tag: v5.19-rc1~159^2~59^2~20^2~4 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5eb14a0cfcaa260c8037ec323c06403554a59345;p=thirdparty%2Flinux.git mt76: mt7615/mt7915: do reset_work with mt76's work queue reset_work may be blocked when mcu message timeout occurs Signed-off-by: Bo Jiao Signed-off-by: Felix Fietkau --- diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/mmio.c b/drivers/net/wireless/mediatek/mt76/mt7615/mmio.c index ce45c3bfc443e..a208035e197ae 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7615/mmio.c +++ b/drivers/net/wireless/mediatek/mt76/mt7615/mmio.c @@ -145,7 +145,7 @@ static void mt7615_irq_tasklet(struct tasklet_struct *t) return; dev->reset_state = mcu_int; - ieee80211_queue_work(mt76_hw(dev), &dev->reset_work); + queue_work(dev->mt76.wq, &dev->reset_work); wake_up(&dev->reset_wait); } diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mmio.c b/drivers/net/wireless/mediatek/mt76/mt7915/mmio.c index c6446757ad4a5..846e71042dc39 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7915/mmio.c +++ b/drivers/net/wireless/mediatek/mt76/mt7915/mmio.c @@ -610,7 +610,7 @@ static void mt7915_irq_tasklet(struct tasklet_struct *t) mt76_wr(dev, MT_MCU_CMD, val); if (val & MT_MCU_CMD_ERROR_MASK) { dev->reset_state = val; - ieee80211_queue_work(mt76_hw(dev), &dev->reset_work); + queue_work(dev->mt76.wq, &dev->reset_work); wake_up(&dev->reset_wait); } }