diff options
| author | Mikel Astiz <mikel.astiz@bmw-carit.de> | 2012-03-13 14:19:54 +0100 |
|---|---|---|
| committer | Johan Hedberg <johan.hedberg@intel.com> | 2012-03-13 15:53:07 +0200 |
| commit | f732bbf978711c65ae374a9be1f15dd3952f8b80 (patch) | |
| tree | ed7a9985cbe81e9be7ab63967a06ae8cf5b1f637 /audio | |
| parent | cff8c39fb53a931e406891391fb8e7e3c52678ae (diff) | |
audio: fix missing unref in case of error
audio_adapter_get() increases the reference counter of the adapter, so
it's necessary to decrement it in case of error.
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/manager.c | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/audio/manager.c b/audio/manager.c index 68a0a568a..f15893d43 100644 --- a/audio/manager.c +++ b/audio/manager.c @@ -964,12 +964,17 @@ static void headset_server_remove(struct btd_adapter *adapter) static int gateway_server_probe(struct btd_adapter *adapter) { struct audio_adapter *adp; + int err; adp = audio_adapter_get(adapter); if (!adp) return -EINVAL; - return gateway_server_init(adp); + err = gateway_server_init(adp); + if (err < 0) + audio_adapter_unref(adp); + + return err; } static void gateway_server_remove(struct btd_adapter *adapter) @@ -1040,6 +1045,7 @@ static int avrcp_server_probe(struct btd_adapter *adapter) struct audio_adapter *adp; const gchar *path = adapter_get_path(adapter); bdaddr_t src; + int err; DBG("path %s", path); @@ -1049,7 +1055,11 @@ static int avrcp_server_probe(struct btd_adapter *adapter) adapter_get_address(adapter, &src); - return avrcp_register(connection, &src, config); + err = avrcp_register(connection, &src, config); + if (err < 0) + audio_adapter_unref(adp); + + return err; } static void avrcp_server_remove(struct btd_adapter *adapter) @@ -1074,6 +1084,7 @@ static int media_server_probe(struct btd_adapter *adapter) struct audio_adapter *adp; const gchar *path = adapter_get_path(adapter); bdaddr_t src; + int err; DBG("path %s", path); @@ -1083,7 +1094,11 @@ static int media_server_probe(struct btd_adapter *adapter) adapter_get_address(adapter, &src); - return media_register(connection, path, &src); + err = media_register(connection, path, &src); + if (err < 0) + audio_adapter_unref(adp); + + return err; } static void media_server_remove(struct btd_adapter *adapter) |