From: Felix Fietkau Date: Tue, 17 Dec 2019 03:59:05 +0000 (+0100) Subject: mt76: mt7615: store N9 firmware version instead of CR4 X-Git-Tag: microblaze-v5.10~1137^2~240^2^2~33 X-Git-Url: http://git.monstr.eu/?a=commitdiff_plain;h=4e569727da74358a773bef08a1426e22c7d8b0eb;p=linux-2.6-microblaze.git mt76: mt7615: store N9 firmware version instead of CR4 CR4 is used very little, N9 is the main firmware that the driver interacts with Signed-off-by: Felix Fietkau --- diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c index 097d3fc365f7..2352e7687790 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c +++ b/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c @@ -491,6 +491,10 @@ static int mt7615_load_n9(struct mt7615_dev *dev, const char *name) goto out; } + snprintf(dev->mt76.hw->wiphy->fw_version, + sizeof(dev->mt76.hw->wiphy->fw_version), + "%.10s-%.15s", hdr->fw_ver, hdr->build_date); + out: release_firmware(fw); return ret; @@ -528,10 +532,6 @@ static int mt7615_load_cr4(struct mt7615_dev *dev, const char *name) goto out; } - snprintf(dev->mt76.hw->wiphy->fw_version, - sizeof(dev->mt76.hw->wiphy->fw_version), - "%.10s-%.15s", hdr->fw_ver, hdr->build_date); - out: release_firmware(fw);