]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commitdiff
mt76: mt7615: always release sem in mt7615_load_patch
authorLorenzo Bianconi <lorenzo@kernel.org>
Tue, 2 Jul 2019 09:24:51 +0000 (11:24 +0200)
committerFelix Fietkau <nbd@nbd.name>
Thu, 5 Sep 2019 15:42:28 +0000 (17:42 +0200)
Release patch semaphore even if request_firmware fails in
mt7615_load_patch

Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: Felix Fietkau <nbd@nbd.name>
drivers/net/wireless/mediatek/mt76/mt7615/mcu.c

index de371bd2e0b95531c5bfe1353daf00cf0baa6a8e..00f395dc75a67faecbc32a3cf799816a37806ae7 100644 (file)
@@ -314,9 +314,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);
@@ -332,7 +332,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");