Bluetooth: btmtksdio: Check function enabled before doing close

ChrisCH-Lu · Vudentz · commit 07e90048e356 · 2025-04-25T15:03:19.000-04:00
Check BTMTKSDIO_FUNC_ENABLED flag before doing close to prevent btmtksdio_close been called twice. Fixes: 6ac4233 ("Bluetooth: btmtksdio: Prevent enabling interrupts after IRQ handler removal") Signed-off-by: Chris Lu <chris.lu@mediatek.com> Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
diff --git a/drivers/bluetooth/btmtksdio.c b/drivers/bluetooth/btmtksdio.c
@@ -723,6 +723,10 @@ static int btmtksdio_close(struct hci_dev *hdev)
 {
 	struct btmtksdio_dev *bdev = hci_get_drvdata(hdev);
 
+	/* Skip btmtksdio_close if BTMTKSDIO_FUNC_ENABLED isn't set */
+	if (!test_bit(BTMTKSDIO_FUNC_ENABLED, &bdev->tx_state))
+		return 0;
+
 	sdio_claim_host(bdev->func);
 
 	/* Disable interrupt */

Original file line number	Diff line number	Diff line change
`@@ -723,6 +723,10 @@ static int btmtksdio_close(struct hci_dev *hdev)`
`723`	`723`	`{`
`724`	`724`	`struct btmtksdio_dev *bdev = hci_get_drvdata(hdev);`
`725`	`725`
	`726`	`+ /* Skip btmtksdio_close if BTMTKSDIO_FUNC_ENABLED isn't set */`
	`727`	`+ if (!test_bit(BTMTKSDIO_FUNC_ENABLED, &bdev->tx_state))`
	`728`	`+ return 0;`
	`729`	`+`
`726`	`730`	`sdio_claim_host(bdev->func);`
`727`	`731`
`728`	`732`	`/* Disable interrupt */`