summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--profiles/input/hog-lib.c23
-rw-r--r--src/device.c1
2 files changed, 22 insertions, 2 deletions
diff --git a/profiles/input/hog-lib.c b/profiles/input/hog-lib.c
index 021db386f..7ff1ede3d 100644
--- a/profiles/input/hog-lib.c
+++ b/profiles/input/hog-lib.c
@@ -374,6 +374,15 @@ static void report_value_cb(const guint8 *pdu, guint16 len, gpointer user_data)
error("bt_uhid_send: %s (%d)", strerror(-err), -err);
}
+static void report_notify_destroy(void *user_data)
+{
+ struct report *report = user_data;
+
+ DBG("");
+
+ report->notifyid = 0;
+}
+
static void report_ccc_written_cb(guint8 status, const guint8 *pdu,
guint16 plen, gpointer user_data)
{
@@ -393,7 +402,13 @@ static void report_ccc_written_cb(guint8 status, const guint8 *pdu,
report->notifyid = g_attrib_register(hog->attrib,
ATT_OP_HANDLE_NOTIFY,
report->value_handle,
- report_value_cb, report, NULL);
+ report_value_cb, report,
+ report_notify_destroy);
+ if (!report->notifyid) {
+ error("Unable to register report notification: handle 0x%04x",
+ report->value_handle);
+ goto remove;
+ }
DBG("Report characteristic descriptor written: notifications enabled");
@@ -1798,7 +1813,11 @@ bool bt_hog_attach(struct bt_hog *hog, void *gatt)
r->notifyid = g_attrib_register(hog->attrib,
ATT_OP_HANDLE_NOTIFY,
r->value_handle,
- report_value_cb, r, NULL);
+ report_value_cb, r,
+ report_notify_destroy);
+ if (!r->notifyid)
+ error("Unable to register report notification: "
+ "handle 0x%04x", r->value_handle);
}
return true;
diff --git a/src/device.c b/src/device.c
index 995d39f2c..28b93eb9a 100644
--- a/src/device.c
+++ b/src/device.c
@@ -5152,6 +5152,7 @@ static void gatt_client_init(struct btd_device *device)
}
bt_gatt_client_set_debug(device->client, gatt_debug, NULL, NULL);
+ g_attrib_attach_client(device->attrib, device->client);
/*
* Notify notify existing service about the new connection so they can