[PATCH 5.3 342/344] mt76: mt7615: always release sem in mt7615_load_patch

[Greg Kroah-Hartman]

From: Lorenzo Bianconi <lore...@kernel.org>

[ Upstream commit 2fc446487c364bf8bbd5f8f5f27e52d914fa1d72 ]

Release patch semaphore even if request_firmware fails in
mt7615_load_patch

Signed-off-by: Lorenzo Bianconi <lore...@kernel.org>
Signed-off-by: Felix Fietkau <n...@nbd.name>
Signed-off-by: Sasha Levin <sas...@kernel.org>
---
 drivers/net/wireless/mediatek/mt76/mt7615/mcu.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c 
b/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c
index cdad2c8dc2971..7ef681fea3f8f 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c
@@ -257,9 +257,9 @@ static int mt7615_driver_own(struct mt7615_dev *dev)
 
 static int mt7615_load_patch(struct mt7615_dev *dev)
 {
-       const struct firmware *fw;
-       const struct mt7615_patch_hdr *hdr;
        const char *firmware = MT7615_ROM_PATCH;
+       const struct mt7615_patch_hdr *hdr;
+       const struct firmware *fw = NULL;
        int len, ret, sem;
 
        sem = mt7615_mcu_patch_sem_ctrl(dev, 1);
@@ -275,7 +275,7 @@ static int mt7615_load_patch(struct mt7615_dev *dev)
 
        ret = request_firmware(&fw, firmware, dev->mt76.dev);
        if (ret)
-               return ret;
+               goto out;
 
        if (!fw || !fw->data || fw->size < sizeof(*hdr)) {
                dev_err(dev->mt76.dev, "Invalid firmware\n");
-- 
2.20.1