summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleksander Morgado <aleksander@aleksander.es>2020-07-10 10:17:01 +0200
committerAleksander Morgado <aleksander@aleksander.es>2020-07-10 10:30:10 +0200
commit4712154279402356a8d51c90f42742e3b642f6d2 (patch)
tree2bec4c820b1dbe55ab9740ac32e7bb2826b38765
parente9087a9c567250a8c88e3e5d5c8a33adaf32e357 (diff)
downloadlibmbim-4712154279402356a8d51c90f42742e3b642f6d2.tar.gz
libmbim-glib,proxy: fix reporting of merged subscribe list
We were doing the subscribe list merge correctly, but not reporting it as done because the 'updated' pointer is set to NULL before returning it. This was breaking QMI over MBIM indications, as the registration message to request them was never sent to the device. (cherry picked from commit ecd188ff0126866199fd453e962ba54ba1dce290)
-rw-r--r--src/libmbim-glib/mbim-proxy.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libmbim-glib/mbim-proxy.c b/src/libmbim-glib/mbim-proxy.c
index 93b36ad..af1391b 100644
--- a/src/libmbim-glib/mbim-proxy.c
+++ b/src/libmbim-glib/mbim-proxy.c
@@ -1297,8 +1297,8 @@ merge_client_service_subscribe_lists (MbimProxy *self,
ctx->mbim_event_entry_array_size);
}
- *out_size = updated_size;
- return updated;
+ *out_size = ctx->mbim_event_entry_array_size;
+ return ctx->mbim_event_entry_array;
}
static void