summaryrefslogtreecommitdiff
path: root/net/bluetooth/amp.c
diff options
context:
space:
mode:
authorAndrei Emeltchenko <andrei.emeltchenko@intel.com>2012-10-05 17:56:55 +0400
committerGustavo Padovan <gustavo.padovan@collabora.co.uk>2012-10-08 02:19:04 +0400
commitfa4ebc66c432d0e0ec947cb754d4144c4a681f28 (patch)
treece31c236f663a249276883413f19dba534569738 /net/bluetooth/amp.c
parent85e34368dea6fc8a2d16464e01c85d3b7bd682bd (diff)
downloadlinux-fa4ebc66c432d0e0ec947cb754d4144c4a681f28.tar.xz
Bluetooth: AMP: Factor out amp_ctrl_add
Add ctrl_id parameter to amp_ctrl_add since we always set it after function ctrl is created. Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com> Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Diffstat (limited to 'net/bluetooth/amp.c')
-rw-r--r--net/bluetooth/amp.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/net/bluetooth/amp.c b/net/bluetooth/amp.c
index b6e1c3ac74f1..2fc5562a84b9 100644
--- a/net/bluetooth/amp.c
+++ b/net/bluetooth/amp.c
@@ -45,7 +45,7 @@ int amp_ctrl_put(struct amp_ctrl *ctrl)
return kref_put(&ctrl->kref, &amp_ctrl_destroy);
}
-struct amp_ctrl *amp_ctrl_add(struct amp_mgr *mgr)
+struct amp_ctrl *amp_ctrl_add(struct amp_mgr *mgr, u8 id)
{
struct amp_ctrl *ctrl;
@@ -53,12 +53,13 @@ struct amp_ctrl *amp_ctrl_add(struct amp_mgr *mgr)
if (!ctrl)
return NULL;
+ kref_init(&ctrl->kref);
+ ctrl->id = id;
+
mutex_lock(&mgr->amp_ctrls_lock);
list_add(&ctrl->list, &mgr->amp_ctrls);
mutex_unlock(&mgr->amp_ctrls_lock);
- kref_init(&ctrl->kref);
-
BT_DBG("mgr %p ctrl %p", mgr, ctrl);
return ctrl;