summaryrefslogtreecommitdiffstats
path: root/net/bluetooth/cmtp
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2012-10-19 15:22:27 -0400
committerJohn W. Linville <linville@tuxdriver.com>2012-10-19 15:22:27 -0400
commitbc27d5f14363a1065bf9437a5bca5409492b6c06 (patch)
treef99ab7eed550f28eec8c68a468c6161320fe9ee1 /net/bluetooth/cmtp
parentddffeb8c4d0331609ef2581d84de4d763607bd37 (diff)
parentf706adfeade767d2194c9f39c0f75e944b0bdd23 (diff)
downloadop-kernel-dev-bc27d5f14363a1065bf9437a5bca5409492b6c06.zip
op-kernel-dev-bc27d5f14363a1065bf9437a5bca5409492b6c06.tar.gz
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.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bluetooth/cmtp/core.c b/net/bluetooth/cmtp/core.c
index 6c9c1fd..e0a6ebf 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;
OpenPOWER on IntegriCloud