From 0c747a21e8244257e70f801b56ad3e71707aa03a Mon Sep 17 00:00:00 2001
From: "Gustavo F. Padovan" <padovan@profusion.mobi>
Date: Fri, 7 Oct 2011 01:29:51 -0300
Subject: [PATCH] --- yaml --- r: 277663 b: refs/heads/master c:
 3e90dc86f4b840297bd1fafdb9ba1bf58f2e0e49 h: refs/heads/master i:   277661:
 ab66c2fe0bfb29d00dd214799d744979d872bba9   277659:
 d9b5ba67f2acb1c1d80f90833dab61e8ad505e52   277655:
 7a5ed881e0517265b66e1548919b74c7687c9a79   277647:
 01edd4c5f678d0d8216bf61dbd2119152c964a9b   277631:
 b209814002690828abbe1cb63872970f83a5b0bb v: v3

---
 [refs]                          | 2 +-
 trunk/net/bluetooth/hidp/core.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 9378e73701aa..94afcbb240d1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 81b25cd04387fbceb76fe893db4863a380941413
+refs/heads/master: 3e90dc86f4b840297bd1fafdb9ba1bf58f2e0e49
diff --git a/trunk/net/bluetooth/hidp/core.c b/trunk/net/bluetooth/hidp/core.c
index fbbf80295020..217ef4761560 100644
--- a/trunk/net/bluetooth/hidp/core.c
+++ b/trunk/net/bluetooth/hidp/core.c
@@ -783,7 +783,7 @@ static int hidp_session(void *arg)
 	return 0;
 }
 
-static struct hci_conn *hidp_find_connection(struct hidp_session *session)
+static struct hci_conn *hidp_get_connection(struct hidp_session *session)
 {
 	bdaddr_t *src = &bt_sk(session->ctrl_sock->sk)->src;
 	bdaddr_t *dst = &bt_sk(session->ctrl_sock->sk)->dst;
@@ -995,7 +995,7 @@ int hidp_add_connection(struct hidp_connadd_req *req, struct socket *ctrl_sock,
 		return -ENOMEM;
 	}
 
-	session->conn = hidp_find_connection(session);
+	session->conn = hidp_get_connection(session);
 	if (!session->conn) {
 		err = -ENOTCONN;
 		goto failed;