diff options
| author | Kalle Valo <kvalo@codeaurora.org> | 2020-05-18 15:03:37 +0300 |
|---|---|---|
| committer | Kalle Valo <kvalo@codeaurora.org> | 2020-05-18 15:03:37 +0300 |
| commit | eda31200e68d38fbb974e7ad02bcc2de2cfe6863 (patch) | |
| tree | 8ff7f88d862b97ec4139c1c13f23ade1d805a070 /drivers/net/wireless/mediatek/mt76/mt76x02_mcu.c | |
| parent | c73fb4d33e1df3fc62a6521601227efd1e2ff9f1 (diff) | |
| parent | 12a87174accd29ff943d4c5fb735e1541b92630b (diff) | |
Merge tag 'mt76-for-kvalo-2020-05-14' of https://github.com/nbd168/wireless
mt76 patches for 5.8
* new devices for mt76x0/mt76x2
* mt7615 fixes
* mt7663 fixes
* support for non-offload firmware on mt7663
* hw/sched scan support for mt7663
* mt7615/mt7663 MSI support
* TDLS support
* mt7603/mt7615 rate control fixes
* new driver for mt7915
* wowlan support for mt7663
* suspend/resume support for mt7663
# gpg: Signature made Thu 14 May 2020 01:10:07 PM EEST using DSA key ID 02A76EF5
# gpg: Good signature from "Felix Fietkau <nbd@nbd.name>"
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg: There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 75D1 1A7D 91A7 710F 4900 42EF D77D 141D 02A7 6EF5
Diffstat (limited to 'drivers/net/wireless/mediatek/mt76/mt76x02_mcu.c')
| -rw-r--r-- | drivers/net/wireless/mediatek/mt76/mt76x02_mcu.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02_mcu.c b/drivers/net/wireless/mediatek/mt76/mt76x02_mcu.c index 5664749ad6c1..89a8992d84fa 100644 --- a/drivers/net/wireless/mediatek/mt76/mt76x02_mcu.c +++ b/drivers/net/wireless/mediatek/mt76/mt76x02_mcu.c @@ -20,7 +20,10 @@ int mt76x02_mcu_msg_send(struct mt76_dev *mdev, int cmd, const void *data, int ret; u8 seq; - skb = mt76x02_mcu_msg_alloc(data, len); + if (mt76_is_mmio(&dev->mt76) && dev->mcu_timeout) + return -EIO; + + skb = mt76_mcu_msg_alloc(mdev, data, len); if (!skb) return -ENOMEM; |