提交 e8803534 编写于 作者: M Marcel Holtmann 提交者: Johan Hedberg

Bluetooth: Simplify device type check for AMP discover response

When counting the number for AMP controllers, a positive check is
used. To be consistent, use the same check when actually adding
the data for the AMP contollers.
Signed-off-by: NMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: NJohan Hedberg <johan.hedberg@intel.com>
上级 01cd3404
...@@ -78,24 +78,20 @@ u8 __next_ident(struct amp_mgr *mgr) ...@@ -78,24 +78,20 @@ u8 __next_ident(struct amp_mgr *mgr)
/* hci_dev_list shall be locked */ /* hci_dev_list shall be locked */
static void __a2mp_add_cl(struct amp_mgr *mgr, struct a2mp_cl *cl) static void __a2mp_add_cl(struct amp_mgr *mgr, struct a2mp_cl *cl)
{ {
int i = 0;
struct hci_dev *hdev; struct hci_dev *hdev;
int i = 1;
cl[0].id = AMP_ID_BREDR; cl[0].id = AMP_ID_BREDR;
cl[0].type = AMP_TYPE_BREDR; cl[0].type = AMP_TYPE_BREDR;
cl[0].status = AMP_STATUS_BLUETOOTH_ONLY; cl[0].status = AMP_STATUS_BLUETOOTH_ONLY;
list_for_each_entry(hdev, &hci_dev_list, list) { list_for_each_entry(hdev, &hci_dev_list, list) {
/* Iterate through AMP controllers */ if (hdev->dev_type == HCI_AMP) {
if (hdev->dev_type != HCI_AMP) cl[i].id = hdev->id;
continue; cl[i].type = hdev->amp_type;
cl[i].status = hdev->amp_status;
/* Starting from second entry */ i++;
++i; }
cl[i].id = hdev->id;
cl[i].type = hdev->amp_type;
cl[i].status = hdev->amp_status;
} }
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册