]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commitdiff
Bluetooth: btusb: Add the missed release_firmware() in btusb_mtk_setup_firmware()
authorJing Xiangfeng <jingxiangfeng@huawei.com>
Tue, 17 Nov 2020 02:59:17 +0000 (10:59 +0800)
committerPaolo Pisati <paolo.pisati@canonical.com>
Mon, 4 Jan 2021 15:37:20 +0000 (16:37 +0100)
BugLink: https://bugs.launchpad.net/bugs/1910111
[ Upstream commit d1e9d232e1e60fa63df1b836ec3ecba5abd3fa9d ]

btusb_mtk_setup_firmware() misses to call release_firmware() in an error
path. Jump to err_release_fw to fix it.

Fixes: f645125711c8 ("Bluetooth: btusb: fix up firmware download sequence")
Signed-off-by: Jing Xiangfeng <jingxiangfeng@huawei.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>
drivers/bluetooth/btusb.c

index 68e7ec76e41f6d288c7762c5331fac5efa5ed8b3..182a8dd7c2eaf75edb53dd3e90d440046ee609a2 100644 (file)
@@ -3068,7 +3068,7 @@ static int btusb_mtk_setup_firmware(struct hci_dev *hdev, const char *fwname)
        err = btusb_mtk_hci_wmt_sync(hdev, &wmt_params);
        if (err < 0) {
                bt_dev_err(hdev, "Failed to power on data RAM (%d)", err);
-               return err;
+               goto err_release_fw;
        }
 
        fw_ptr = fw->data;