diff options
| author | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-06-04 19:45:38 +0800 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-06-04 19:45:38 +0800 |
| commit | 20c81608dcd30fc3817d6d430fca83f52b9aa965 (patch) | |
| tree | 1089db91ce174f5768dadd210ba3096ad027c8a6 /net/bluetooth/mgmt.c | |
| parent | 78b63e0cee40de1adbe69ceee752ae3b6a6d36e2 (diff) | |
| parent | 961f14635e3589d262af5dcdc596cbb5bc24aea7 (diff) | |
Merge topic branch 'other' into integration-linux-ux500
Diffstat (limited to 'net/bluetooth/mgmt.c')
| -rw-r--r-- | net/bluetooth/mgmt.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c index 4bb03b11112..93a19683702 100644 --- a/net/bluetooth/mgmt.c +++ b/net/bluetooth/mgmt.c @@ -1892,10 +1892,10 @@ static int pair_device(struct sock *sk, struct hci_dev *hdev, void *data, if (cp->addr.type == MGMT_ADDR_BREDR) conn = hci_connect(hdev, ACL_LINK, &cp->addr.bdaddr, sec_level, - auth_type); + auth_type, NULL); else conn = hci_connect(hdev, LE_LINK, &cp->addr.bdaddr, sec_level, - auth_type); + auth_type, NULL); memset(&rp, 0, sizeof(rp)); bacpy(&rp.addr.bdaddr, &cp->addr.bdaddr); |