From 67d1e1774b3ff2d7a09fcf49484515bd85c02d14 Mon Sep 17 00:00:00 2001 From: Johan Hedberg Date: Thu, 30 Aug 2007 09:13:51 +0000 Subject: Fix stream setup error handling --- audio/a2dp.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'audio/a2dp.c') diff --git a/audio/a2dp.c b/audio/a2dp.c index aea7224a..45a1bfe0 100644 --- a/audio/a2dp.c +++ b/audio/a2dp.c @@ -315,11 +315,7 @@ static void discovery_complete(struct avdtp *session, GSList *seps, int err, if (err < 0) { error("avdtp_set_configuration: %s", strerror(-err)); finalize_stream_setup(setup); - return; } - - /* Notify sink.c of the new stream */ - sink_new_stream(setup->dev, session, setup->stream); } static gboolean setconf_ind(struct avdtp *session, @@ -434,6 +430,9 @@ static void setconf_cfm(struct avdtp *session, struct avdtp_local_sep *sep, if (!setup) return; + /* Notify sink.c of the new stream */ + sink_new_stream(setup->dev, session, setup->stream); + ret = avdtp_open(session, stream); if (ret < 0) { error("Error on avdtp_open %s (%d)", strerror(-ret), -- cgit