diff options
| author | Johan Hedberg <johan.hedberg@nokia.com> | 2009-02-23 14:10:54 +0200 |
|---|---|---|
| committer | Johan Hedberg <johan.hedberg@nokia.com> | 2009-02-23 14:10:54 +0200 |
| commit | be61ef7476cd9d6c4eb53c8f6b631a91218b4da2 (patch) | |
| tree | 7dcac8529a98d3a47c02c97438739ed3bc6c97a2 /input/server.c | |
| parent | 8a706acad288850f22e322cdcb62c2f585d9910d (diff) | |
Only send unplug in case of ENOENT
Diffstat (limited to 'input/server.c')
| -rw-r--r-- | input/server.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/input/server.c b/input/server.c index b20570b7..af15282f 100644 --- a/input/server.c +++ b/input/server.c @@ -26,6 +26,7 @@ #endif #include <unistd.h> +#include <errno.h> #include <bluetooth/bluetooth.h> #include <bluetooth/sdp.h> @@ -80,6 +81,7 @@ static void connect_event_cb(GIOChannel *chan, GError *err, gpointer data) uint16_t psm; bdaddr_t src, dst; GError *gerr = NULL; + int ret; if (err) { error("%s", err->message); @@ -100,9 +102,10 @@ static void connect_event_cb(GIOChannel *chan, GError *err, gpointer data) debug("Incoming connection on PSM %d", psm); - if (input_device_set_channel(&src, &dst, psm, chan) < 0) { + ret = input_device_set_channel(&src, &dst, psm, chan); + if (ret < 0) { /* Send unplug virtual cable to unknown devices */ - if (psm == L2CAP_PSM_HIDP_CTRL) { + if (ret == -ENOENT && psm == L2CAP_PSM_HIDP_CTRL) { unsigned char unplug = 0x15; int err, sk = g_io_channel_unix_get_fd(chan); err = write(sk, &unplug, sizeof(unplug)); @@ -113,7 +116,6 @@ static void connect_event_cb(GIOChannel *chan, GError *err, gpointer data) if (psm == L2CAP_PSM_HIDP_INTR) { struct authorization_data *auth; - int ret; auth = g_new0(struct authorization_data, 1); bacpy(&auth->src, &src); |