Commit d17010bf authored by Colin Ian King's avatar Colin Ian King Committed by Marcel Holtmann

Bluetooth: Remove redundant check on status

The check on status is redundant as a status has to be zero at
the point it is being checked because of a previous check and return
path via label 'unlock'.  Remove the redundant check and the deadcode
that can never be reached.

Detected by CoverityScan, CID#1471710 ("Logically dead code")
Signed-off-by: default avatarColin Ian King <colin.king@canonical.com>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent dd1a8f8a
...@@ -4937,31 +4937,27 @@ static void le_conn_complete_evt(struct hci_dev *hdev, u8 status, ...@@ -4937,31 +4937,27 @@ static void le_conn_complete_evt(struct hci_dev *hdev, u8 status,
hci_debugfs_create_conn(conn); hci_debugfs_create_conn(conn);
hci_conn_add_sysfs(conn); hci_conn_add_sysfs(conn);
if (!status) { /* The remote features procedure is defined for master
/* The remote features procedure is defined for master * role only. So only in case of an initiated connection
* role only. So only in case of an initiated connection * request the remote features.
* request the remote features. *
* * If the local controller supports slave-initiated features
* If the local controller supports slave-initiated features * exchange, then requesting the remote features in slave
* exchange, then requesting the remote features in slave * role is possible. Otherwise just transition into the
* role is possible. Otherwise just transition into the * connected state without requesting the remote features.
* connected state without requesting the remote features. */
*/ if (conn->out ||
if (conn->out || (hdev->le_features[0] & HCI_LE_SLAVE_FEATURES)) {
(hdev->le_features[0] & HCI_LE_SLAVE_FEATURES)) { struct hci_cp_le_read_remote_features cp;
struct hci_cp_le_read_remote_features cp;
cp.handle = __cpu_to_le16(conn->handle); cp.handle = __cpu_to_le16(conn->handle);
hci_send_cmd(hdev, HCI_OP_LE_READ_REMOTE_FEATURES, hci_send_cmd(hdev, HCI_OP_LE_READ_REMOTE_FEATURES,
sizeof(cp), &cp); sizeof(cp), &cp);
hci_conn_hold(conn); hci_conn_hold(conn);
} else {
conn->state = BT_CONNECTED;
hci_connect_cfm(conn, status);
}
} else { } else {
conn->state = BT_CONNECTED;
hci_connect_cfm(conn, status); hci_connect_cfm(conn, status);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment