summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarlo Lobrano <c.lobrano@gmail.com>2016-04-05 08:18:57 +0200
committerAleksander Morgado <aleksander@aleksander.es>2016-04-06 10:50:35 +0200
commit8a386218690aeff7e2c923a14f91da7bbc046ed2 (patch)
tree50494be8b477d1a3a17153649d9330bba79dbfe8
parent1f13909d9b59176afd9cec32cfbd623b44ec8d80 (diff)
downloadModemManager-8a386218690aeff7e2c923a14f91da7bbc046ed2.tar.gz
dell: fixed cgmi_retries in dell_custom_init
Initialized "cgmi_retries" variable from CustomInitContext with the same value as the other retries, moreover the context is now allocated with g_slice_new0. Before this changes, when cgmi_retries assumed big values during the probing of no AT-capable ports, the command AT+CGMI (mm-plugin-dell.c:custom_init_step) was sent a semi-infinite number of times, blocking the plugin's initialization.
-rw-r--r--plugins/dell/mm-plugin-dell.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/plugins/dell/mm-plugin-dell.c b/plugins/dell/mm-plugin-dell.c
index 0dff19b30..ced1f3b7b 100644
--- a/plugins/dell/mm-plugin-dell.c
+++ b/plugins/dell/mm-plugin-dell.c
@@ -297,7 +297,7 @@ dell_custom_init (MMPortProbe *probe,
{
CustomInitContext *ctx;
- ctx = g_slice_new (CustomInitContext);
+ ctx = g_slice_new0 (CustomInitContext);
ctx->result = g_simple_async_result_new (G_OBJECT (probe),
callback,
user_data,
@@ -306,6 +306,7 @@ dell_custom_init (MMPortProbe *probe,
ctx->port = g_object_ref (port);
ctx->cancellable = cancellable ? g_object_ref (cancellable) : NULL;
ctx->gmi_retries = 3;
+ ctx->cgmi_retries = 3;
ctx->ati_retries = 3;
custom_init_step (ctx);