summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcel Holtmann <marcel@holtmann.org>2008-10-06 22:58:47 +0200
committerMarcel Holtmann <marcel@holtmann.org>2008-10-06 22:58:47 +0200
commit97cfec2fc4f207491f5de8cc3169f0e9094f05db (patch)
treed5f117fee7ae3c05a3af2e17035ed7f63219346c
parentcb117a588dabe14de83d6ae3e74b305f70dfb201 (diff)
parent039a56e77f0d25741c204a6888fcf4d83e9243d6 (diff)
Merge branch 'for-upstream' of git://gitorious.org/bluez/vudentzs-clone
-rw-r--r--common/glib-helper.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/common/glib-helper.c b/common/glib-helper.c
index c05ac5c5..93e9c27a 100644
--- a/common/glib-helper.c
+++ b/common/glib-helper.c
@@ -775,7 +775,7 @@ static BtIOError sco_connect(BtIO *io, BtIOFunc func)
{
struct io_context *io_ctxt = io->io_ctxt;
struct sockaddr_sco addr;
- int sk, err;
+ int err;
io_ctxt->func = func;
@@ -790,7 +790,7 @@ static BtIOError sco_connect(BtIO *io, BtIOFunc func)
err = transport_connect(io, (struct sockaddr *) &addr,
sizeof(addr));
if (err < 0) {
- close(sk);
+ close(io_ctxt->fd);
return BT_IO_FAILED;
}