summaryrefslogtreecommitdiffstats
path: root/audio
diff options
context:
space:
mode:
authorClaudio Takahasi <claudio.takahasi@openbossa.org>2007-01-25 17:27:52 +0000
committerClaudio Takahasi <claudio.takahasi@openbossa.org>2007-01-25 17:27:52 +0000
commit97e3051ec51ac5bdcb37a371249360163eaf5709 (patch)
tree9b73ed207630e7e9ce92e5dd4ff9fccccbae4e24 /audio
parente28ba76d230192a1a970819cc3588b986a624ea2 (diff)
set_nonblocking: removed err argument
Diffstat (limited to 'audio')
-rw-r--r--audio/headset.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/audio/headset.c b/audio/headset.c
index 55a47e8e..cb33f149 100644
--- a/audio/headset.c
+++ b/audio/headset.c
@@ -697,8 +697,10 @@ static int rfcomm_connect(struct headset *hs, int *err)
goto failed;
}
- if (set_nonblocking(sk, err) < 0)
+ if (set_nonblocking(sk) < 0) {
+ *err = errno;
goto failed;
+ }
memset(&addr, 0, sizeof(addr));
addr.rc_family = AF_BLUETOOTH;
@@ -1367,7 +1369,8 @@ static DBusHandlerResult hs_play(struct headset *hs, DBusMessage *msg)
goto failed;
}
- if (set_nonblocking(sk, &err) < 0) {
+ if (set_nonblocking(sk) < 0) {
+ err = errno;
err_connect_failed(connection, msg, err);
goto failed;
}