diff options
| author | Lorenzo Bianconi <lorenzo@kernel.org> | 2019-07-02 11:24:51 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-10-05 13:14:17 +0200 |
| commit | 7dcd2e608bd3fdd4535b47f743f92e80b3d56dfb (patch) | |
| tree | 4cf2b8e380c9d6a603c1c95b1a791995840406fc | |
| parent | c959aebdc3135b599384478bbcfc96e2302f435d (diff) | |
| download | linux-stable-7dcd2e608bd3fdd4535b47f743f92e80b3d56dfb.tar.gz linux-stable-7dcd2e608bd3fdd4535b47f743f92e80b3d56dfb.tar.bz2 linux-stable-7dcd2e608bd3fdd4535b47f743f92e80b3d56dfb.zip | |
mt76: mt7615: always release sem in mt7615_load_patch
[ Upstream commit 2fc446487c364bf8bbd5f8f5f27e52d914fa1d72 ]
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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
| -rw-r--r-- | drivers/net/wireless/mediatek/mt76/mt7615/mcu.c | 6 |
1 files 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 dc1301effa24..e2dd425ac97e 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c +++ b/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c @@ -289,9 +289,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); @@ -307,7 +307,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"); |