diff options
| author | Fabian Frederick <fabf@skynet.be> | 2014-10-25 10:48:58 +0200 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2014-10-25 18:53:39 +0200 |
| commit | 4f639edef73c15ddb1534e39f4bd6234ee04e4f8 (patch) | |
| tree | fad3bf23fce4b26fdfd02490bef42726ae064636 /net/bluetooth/hci_conn.c | |
| parent | ed1da148178d90bc21d96f35cfa62f969362495f (diff) | |
| download | blackbird-op-linux-4f639edef73c15ddb1534e39f4bd6234ee04e4f8.tar.gz blackbird-op-linux-4f639edef73c15ddb1534e39f4bd6234ee04e4f8.zip | |
Bluetooth: fix shadow warning in hci_disconnect()
use clkoff_cp for hci_cp_read_clock_offset instead of cp
(already defined above).
Suggested-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Fabian Frederick <fabf@skynet.be>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net/bluetooth/hci_conn.c')
| -rw-r--r-- | net/bluetooth/hci_conn.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c index 11aac06d53ce..6a3225bf7bac 100644 --- a/net/bluetooth/hci_conn.c +++ b/net/bluetooth/hci_conn.c @@ -141,10 +141,11 @@ int hci_disconnect(struct hci_conn *conn, __u8 reason) */ if (conn->type == ACL_LINK && conn->role == HCI_ROLE_MASTER) { struct hci_dev *hdev = conn->hdev; - struct hci_cp_read_clock_offset cp; + struct hci_cp_read_clock_offset clkoff_cp; - cp.handle = cpu_to_le16(conn->handle); - hci_send_cmd(hdev, HCI_OP_READ_CLOCK_OFFSET, sizeof(cp), &cp); + clkoff_cp.handle = cpu_to_le16(conn->handle); + hci_send_cmd(hdev, HCI_OP_READ_CLOCK_OFFSET, sizeof(clkoff_cp), + &clkoff_cp); } conn->state = BT_DISCONN; |
