aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Tsao <peter.tsao@mediatek.com>2024-04-15 22:19:22 +0800
committerLuiz Augusto von Dentz <luiz.von.dentz@intel.com>2024-04-30 13:02:57 -0400
commit29e16b778480453fa4a31b53e3574100e9b46aa0 (patch)
treeaa157c5010990607e0ecb2e07836aada2ea5e952
parentbbc83ec7dc222cb522db30809a0e39add4d810f8 (diff)
downloadbluetooth-next-29e16b778480453fa4a31b53e3574100e9b46aa0.tar.gz
Bluetooth: btusb: Fix the patch for MT7920 the affected to MT7921
Notice: this object is not reachable from any branch.
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@mediatek.com> Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
Notice: this object is not reachable from any branch.
-rw-r--r--drivers/bluetooth/btusb.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
index 4c0cc13adb47dc..8bede0a335668a 100644
--- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
@@ -3123,6 +3123,7 @@ static int btusb_mtk_setup(struct hci_dev *hdev)
bt_dev_err(hdev, "Failed to get fw flavor (%d)", err);
return err;
}
+ fw_flavor = (fw_flavor & 0x00000080) >> 7;
}
mediatek = hci_get_priv(hdev);