2015-02-23 07:59:43

by Andrei Emeltchenko

Subject: [PATCH 1/2] audio/a2dp: Fix queue initialization

From: Andrei Emeltchenko <[email protected]>

After changing GSList to queue initialization was missing.
---
profiles/audio/a2dp.c | 2 ++
1 file changed, 2 insertions(+)

diff --git a/profiles/audio/a2dp.c b/profiles/audio/a2dp.c
index b024742..ad21df3 100644
--- a/profiles/audio/a2dp.c
+++ b/profiles/audio/a2dp.c
@@ -1249,6 +1249,7 @@ static void avdtp_server_destroy(struct avdtp_server *server)
g_io_channel_shutdown(server->io, TRUE, NULL);
g_io_channel_unref(server->io);
btd_adapter_unref(server->adapter);
+ queue_destroy(server->seps, NULL);
g_free(server);
}

@@ -1373,6 +1374,7 @@ static struct avdtp_server *avdtp_server_init(struct btd_adapter *adapter)
}

server->adapter = btd_adapter_ref(adapter);
+ server->seps = queue_new();

avdtp_servers = g_slist_append(avdtp_servers, server);

--
2.1.0

2015-02-23 13:08:30

by Luiz Augusto von Dentz

Subject: Re: [PATCH 1/2] audio/a2dp: Fix queue initialization

Hi Andrei,

On Mon, Feb 23, 2015 at 9:59 AM, Andrei Emeltchenko
<[email protected]> wrote:
> From: Andrei Emeltchenko <[email protected]>
>
> After changing GSList to queue initialization was missing.
> ---
> profiles/audio/a2dp.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/profiles/audio/a2dp.c b/profiles/audio/a2dp.c
> index b024742..ad21df3 100644
> --- a/profiles/audio/a2dp.c
> +++ b/profiles/audio/a2dp.c
> @@ -1249,6 +1249,7 @@ static void avdtp_server_destroy(struct avdtp_server *server)
> g_io_channel_shutdown(server->io, TRUE, NULL);
> g_io_channel_unref(server->io);
> btd_adapter_unref(server->adapter);
> + queue_destroy(server->seps, NULL);
> g_free(server);
> }
>
> @@ -1373,6 +1374,7 @@ static struct avdtp_server *avdtp_server_init(struct btd_adapter *adapter)
> }
>
> server->adapter = btd_adapter_ref(adapter);
> + server->seps = queue_new();
>
> avdtp_servers = g_slist_append(avdtp_servers, server);
>
> --
> 2.1.0

Applied, thanks.


--
Luiz Augusto von Dentz

2015-02-23 07:59:44

by Andrei Emeltchenko

Subject: [PATCH 2/2] audio/a2dp: Fix server name typo

From: Andrei Emeltchenko <[email protected]>

Fixes typo in server name
---
profiles/audio/a2dp.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/profiles/audio/a2dp.c b/profiles/audio/a2dp.c
index ad21df3..6a86c19 100644
--- a/profiles/audio/a2dp.c
+++ b/profiles/audio/a2dp.c
@@ -1418,7 +1418,7 @@ struct a2dp_sep *a2dp_add_sep(struct btd_adapter *adapter, uint8_t type,
avdtp_server = find_avdtp_server(avdtp_servers, adapter);
if (!avdtp_server) {
avdtp_server = avdtp_server_init(adapter);
- if (!server)
+ if (!avdtp_server)
return NULL;
}

--
2.1.0