summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohan Hedberg <johan.hedberg@nokia.com>2007-08-24 13:11:01 +0000
committerJohan Hedberg <johan.hedberg@nokia.com>2007-08-24 13:11:01 +0000
commitc0de0ea2dce19830f16a731266e4299c60e5b1d7 (patch)
tree4edd3b3314d1bfd8f491f5002265a82085c1edc0
parent44f2f4bacfcb1d7fe694c767446c1c8686e6ccf2 (diff)
Remove left-over transport callback in stream_free
-rw-r--r--audio/avdtp.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/audio/avdtp.c b/audio/avdtp.c
index 99a929f4..b90c57b8 100644
--- a/audio/avdtp.c
+++ b/audio/avdtp.c
@@ -471,6 +471,9 @@ static void stream_free(struct avdtp_stream *stream)
if (stream->timer)
g_source_remove(stream->timer);
+ if (stream->io)
+ g_source_remove(stream->io);
+
g_slist_foreach(stream->callbacks, (GFunc) g_free, NULL);
g_slist_free(stream->callbacks);
@@ -1240,6 +1243,8 @@ static gboolean transport_cb(GIOChannel *chan, GIOCondition cond,
sep->cfm->close(stream->session, sep, stream, NULL,
sep->user_data);
+ stream->io = 0;
+
avdtp_sep_set_state(stream->session, sep, AVDTP_STATE_IDLE);
return FALSE;