Merge branch 'exec-for-v5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiede...

[linux-2.6-microblaze.git] / drivers / bluetooth / btmtksdio.c

diff --git a/drivers/bluetooth/btmtksdio.c b/drivers/bluetooth/btmtksdio.c
index c7ab7a2..5f9f027 100644 (file)
--- a/drivers/bluetooth/btmtksdio.c
+++ b/drivers/bluetooth/btmtksdio.c
@@ -496,7 +496,7 @@ static void btmtksdio_interrupt(struct sdio_func *func)
        sdio_claim_host(bdev->func);
 
        /* Disable interrupt */
-       sdio_writel(func, C_INT_EN_CLR, MTK_REG_CHLPCR, 0);
+       sdio_writel(func, C_INT_EN_CLR, MTK_REG_CHLPCR, NULL);
 
        int_status = sdio_readl(func, MTK_REG_CHISR, NULL);
 
@@ -530,7 +530,7 @@ static void btmtksdio_interrupt(struct sdio_func *func)
        }
 
        /* Enable interrupt */
-       sdio_writel(func, C_INT_EN_SET, MTK_REG_CHLPCR, 0);
+       sdio_writel(func, C_INT_EN_SET, MTK_REG_CHLPCR, NULL);
 
        pm_runtime_mark_last_busy(bdev->dev);
        pm_runtime_put_autosuspend(bdev->dev);
@@ -704,7 +704,7 @@ static int mtk_setup_firmware(struct hci_dev *hdev, const char *fwname)
        err = 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 free_fw;
        }
 
        fw_ptr = fw->data;