diff options
| author | Claudio Takahasi <claudio.takahasi@openbossa.org> | 2007-05-09 19:14:12 +0000 |
|---|---|---|
| committer | Claudio Takahasi <claudio.takahasi@openbossa.org> | 2007-05-09 19:14:12 +0000 |
| commit | 1dd87340fa57eb1a6b32f3cb78cc3a309e076b09 (patch) | |
| tree | 063355448bb06ab81441989ddcac799007cf8992 | |
| parent | a7fb39b7fec5bf46bc486fc3a1a693271185113f (diff) | |
serial: let the kernel handle device busy
| -rw-r--r-- | serial/manager.c | 23 |
1 files changed, 1 insertions, 22 deletions
diff --git a/serial/manager.c b/serial/manager.c index c4d29b45..4de3ce87 100644 --- a/serial/manager.c +++ b/serial/manager.c @@ -148,21 +148,6 @@ static struct rfcomm_node *find_node_by_name(const char *name) return NULL; } -static struct pending_connect *find_pending_connect_by_channel(const char *bda, - uint8_t ch) -{ - GSList *l; - - for (l = pending_connects; l != NULL; l = l->next) { - struct pending_connect *pending = l->data; - if (!strcasecmp(bda, pending->bda) && - pending->channel == ch) - return pending; - } - - return NULL; -} - static struct pending_connect *find_pending_connect_by_pattern(const char *bda, const char *pattern) { @@ -540,7 +525,7 @@ fail: static void record_reply(DBusPendingCall *call, void *data) { - struct pending_connect *pending, *pc = data; + struct pending_connect *pc = data; DBusMessage *reply = dbus_pending_call_steal_reply(call); sdp_record_t *rec; const uint8_t *rec_bin; @@ -607,12 +592,6 @@ static void record_reply(DBusPendingCall *call, void *data) goto fail; } - pending = find_pending_connect_by_channel(pc->bda, ch); - if (pending) { - err_connection_in_progress(pc->conn, pc->msg); - goto fail; - } - pc->channel = ch; err = rfcomm_connect(pc); if (err < 0) { |