summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohan Hedberg <johan.hedberg@nokia.com>2009-02-22 16:50:59 +0200
committerJohan Hedberg <johan.hedberg@nokia.com>2009-02-22 16:50:59 +0200
commit8bca00dadf7e50b9723debd322169304573f6a79 (patch)
treed044e751bde9cc4e70f44e12b062ab9c57fe146b
parent8fb3fd137f3d108e373df9501915ee9ff6e23f83 (diff)
Fix bt_io_get parameter passing
-rw-r--r--input/server.c2
-rw-r--r--serial/proxy.c2
-rw-r--r--src/device.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/input/server.c b/input/server.c
index b5b132a2..6d08804b 100644
--- a/input/server.c
+++ b/input/server.c
@@ -103,7 +103,7 @@ static void connect_event_cb(GIOChannel *chan, GError *err, gpointer data)
BT_IO_OPT_SOURCE_BDADDR, &src,
BT_IO_OPT_DEST_BDADDR, &dst,
BT_IO_OPT_PSM, &psm,
- NULL);
+ BT_IO_OPT_INVALID);
if (gerr) {
error("%s", gerr->message);
g_error_free(gerr);
diff --git a/serial/proxy.c b/serial/proxy.c
index 3d21cc3b..d27a7227 100644
--- a/serial/proxy.c
+++ b/serial/proxy.c
@@ -397,7 +397,7 @@ static void connect_event_cb(GIOChannel *chan, GError *conn_err, gpointer data)
bt_io_get(chan, BT_IO_RFCOMM, &err,
BT_IO_OPT_DEST_BDADDR, &prx->dst,
- NULL);
+ BT_IO_OPT_INVALID);
if (err) {
error("%s", err->message);
g_error_free(err);
diff --git a/src/device.c b/src/device.c
index 2c85d33c..6322231c 100644
--- a/src/device.c
+++ b/src/device.c
@@ -1635,7 +1635,7 @@ static void bonding_connect_cb(GIOChannel *io, GError *err, gpointer user_data)
auth_requested_cp cp;
evt_cmd_status rp;
int dd;
- uint8_t handle;
+ uint16_t handle;
if (!device->bonding) {
g_io_channel_shutdown(io, TRUE, NULL);