This is a note to let you know that I've just added the patch titled
Bluetooth: btusb: Fix the patch for MT7920 the affected to MT7921
to the 6.9-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
bluetooth-btusb-fix-the-patch-for-mt7920-the-affected-to-mt7921.patch
and it can be found in the queue-6.9 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 958cd6beab693f395ffe07814ef77d2b45e8b0fc Mon Sep 17 00:00:00 2001
From: Peter Tsao <peter.tsao@xxxxxxxxxxxx>
Date: Mon, 15 Apr 2024 22:19:22 +0800
Subject: Bluetooth: btusb: Fix the patch for MT7920 the affected to MT7921
From: Peter Tsao <peter.tsao@xxxxxxxxxxxx>
commit 958cd6beab693f395ffe07814ef77d2b45e8b0fc upstream.
Because both MT7920 and MT7921 use the same chip ID.
We use the 8th bit of fw_flavor to distingush MT7920.
The original patch made a mistake to check whole fw_flavor,
that makes the condition both true (dev_id == 0x7961 && fw_flavor),
and makes MT7921 flow wrong.
In this patch, we correct the flow to get the 8th bit value for MT7920.
And the patch is verified pass with both MT7920 and MT7921.
Signed-off-by: Peter Tsao <peter.tsao@xxxxxxxxxxxx>
Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/bluetooth/btusb.c | 1 +
1 file changed, 1 insertion(+)
--- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
@@ -3118,6 +3118,7 @@ static int btusb_mtk_setup(struct hci_de
bt_dev_err(hdev, "Failed to get fw flavor (%d)", err);
return err;
}
+ fw_flavor = (fw_flavor & 0x00000080) >> 7;
}
mediatek = hci_get_priv(hdev);
Patches currently in stable-queue which might be from peter.tsao@xxxxxxxxxxxx are
queue-6.9/bluetooth-btusb-fix-the-patch-for-mt7920-the-affected-to-mt7921.patch
