From 6e01436e9b09b038c358b0695548a7a2c3059bdb Mon Sep 17 00:00:00 2001 From: Lukasz Rymanowski Date: Fri, 8 Aug 2014 15:42:33 +0200 Subject: [PATCH] android/a2dp: Improve avdtp_close function With this patch avdtp_close does avdtp_abort under the hood in case stream is not yet in OPEN state. --- android/avdtp.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/android/avdtp.c b/android/avdtp.c index 89f486024..85ef94b3a 100644 --- a/android/avdtp.c +++ b/android/avdtp.c @@ -3244,14 +3244,15 @@ int avdtp_close(struct avdtp *session, struct avdtp_stream *stream, if (!g_slist_find(session->streams, stream)) return -EINVAL; - if (stream->lsep->state < AVDTP_STATE_OPEN) - return -EINVAL; - if (stream->close_int == TRUE) { error("avdtp_close: rejecting since close is already initiated"); return -EINVAL; } + /* If stream is not yet in the OPEN state, let's use ABORT_CMD */ + if (stream->lsep->state < AVDTP_STATE_OPEN) + return avdtp_abort(session, stream); + if (immediate && session->req && stream == session->req->stream) return avdtp_abort(session, stream); -- 2.47.3