diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-10-19 15:22:27 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-10-19 15:22:27 -0400 |
| commit | bc27d5f14363a1065bf9437a5bca5409492b6c06 (patch) | |
| tree | f99ab7eed550f28eec8c68a468c6161320fe9ee1 /net/bluetooth/hidp | |
| parent | ddffeb8c4d0331609ef2581d84de4d763607bd37 (diff) | |
| parent | f706adfeade767d2194c9f39c0f75e944b0bdd23 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next
Diffstat (limited to 'net/bluetooth/hidp')
| -rw-r--r-- | net/bluetooth/hidp/core.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/net/bluetooth/hidp/core.c b/net/bluetooth/hidp/core.c index ccd985da6518..0c0028463fa3 100644 --- a/net/bluetooth/hidp/core.c +++ b/net/bluetooth/hidp/core.c | |||
| @@ -932,8 +932,12 @@ static int hidp_setup_hid(struct hidp_session *session, | |||
| 932 | hid->country = req->country; | 932 | hid->country = req->country; |
| 933 | 933 | ||
| 934 | strncpy(hid->name, req->name, 128); | 934 | strncpy(hid->name, req->name, 128); |
| 935 | strncpy(hid->phys, batostr(&bt_sk(session->ctrl_sock->sk)->src), 64); | 935 | |
| 936 | strncpy(hid->uniq, batostr(&bt_sk(session->ctrl_sock->sk)->dst), 64); | 936 | snprintf(hid->phys, sizeof(hid->phys), "%pMR", |
| 937 | &bt_sk(session->ctrl_sock->sk)->src); | ||
| 938 | |||
| 939 | snprintf(hid->uniq, sizeof(hid->uniq), "%pMR", | ||
| 940 | &bt_sk(session->ctrl_sock->sk)->dst); | ||
| 937 | 941 | ||
| 938 | hid->dev.parent = &session->conn->dev; | 942 | hid->dev.parent = &session->conn->dev; |
| 939 | hid->ll_driver = &hidp_hid_driver; | 943 | hid->ll_driver = &hidp_hid_driver; |