diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-10-19 21:22:27 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-10-19 21:22:27 +0200 |
| commit | bc27d5f14363a1065bf9437a5bca5409492b6c06 (patch) | |
| tree | f99ab7eed550f28eec8c68a468c6161320fe9ee1 /net/bluetooth/cmtp | |
| parent | Linux 3.7-rc1 (diff) | |
| parent | Bluetooth: AMP: Get amp_mgr reference in HS hci_conn (diff) | |
| download | linux-bc27d5f14363a1065bf9437a5bca5409492b6c06.tar.xz linux-bc27d5f14363a1065bf9437a5bca5409492b6c06.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next
Diffstat (limited to 'net/bluetooth/cmtp')
| -rw-r--r-- | net/bluetooth/cmtp/core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bluetooth/cmtp/core.c b/net/bluetooth/cmtp/core.c index 6c9c1fd601ca..e0a6ebf2baa6 100644 --- a/net/bluetooth/cmtp/core.c +++ b/net/bluetooth/cmtp/core.c @@ -353,7 +353,7 @@ int cmtp_add_connection(struct cmtp_connadd_req *req, struct socket *sock) BT_DBG("mtu %d", session->mtu); - sprintf(session->name, "%s", batostr(&bt_sk(sock->sk)->dst)); + sprintf(session->name, "%pMR", &bt_sk(sock->sk)->dst); session->sock = sock; session->state = BT_CONFIG; |