diff options
| author | Marcel Holtmann <marcel@holtmann.org> | 2013-10-06 02:08:35 -0700 |
|---|---|---|
| committer | Johan Hedberg <johan.hedberg@intel.com> | 2013-10-06 11:12:47 +0200 |
| commit | e8803534a03ddfcb37bd3d6cb981c5131a5bd993 (patch) | |
| tree | a4c98214a539c69d5ca8ef942c51a0a79d730aae | |
| parent | 01cd340427ab01a744a539981bcc4ef00e5ad133 (diff) | |
| download | linux-e8803534a03ddfcb37bd3d6cb981c5131a5bd993.tar.bz2 | |
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: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
| -rw-r--r-- | net/bluetooth/a2mp.c | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/net/bluetooth/a2mp.c b/net/bluetooth/a2mp.c index ad8bda3a6fd1..9410e272d8b6 100644 --- a/net/bluetooth/a2mp.c +++ b/net/bluetooth/a2mp.c @@ -78,24 +78,20 @@ u8 __next_ident(struct amp_mgr *mgr) /* hci_dev_list shall be locked */ static void __a2mp_add_cl(struct amp_mgr *mgr, struct a2mp_cl *cl) { - int i = 0; struct hci_dev *hdev; + int i = 1; cl[0].id = AMP_ID_BREDR; cl[0].type = AMP_TYPE_BREDR; cl[0].status = AMP_STATUS_BLUETOOTH_ONLY; list_for_each_entry(hdev, &hci_dev_list, list) { - /* Iterate through AMP controllers */ - if (hdev->dev_type != HCI_AMP) - continue; - - /* Starting from second entry */ - ++i; - - cl[i].id = hdev->id; - cl[i].type = hdev->amp_type; - cl[i].status = hdev->amp_status; + if (hdev->dev_type == HCI_AMP) { + cl[i].id = hdev->id; + cl[i].type = hdev->amp_type; + cl[i].status = hdev->amp_status; + i++; + } } } |