SymbX/ModemManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

port-probe: consolidate serial port closure and cleanup

Browse Source 
Signed-off-by: Dan Williams <dan@ioncontrol.co>
This commit is contained in:
Dan Williams
2024-09-17 11:11:23 -05:00
parent 76b48f6194
commit 6664d3740d
1 changed files with 19 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mm-port-probe.c
+19 -23
View File
@@ -409,6 +409,21 @@ static gboolean serial_probe_at (MMPortProbe *self);
static gboolean serial_probe_qcdm (MMPortProbe *self);
static void serial_probe_schedule (MMPortProbe *self);
static void
clear_probe_serial_port (PortProbeRunContext *ctx)
{
if (ctx->serial) {
if (ctx->buffer_full_id) {
g_signal_handler_disconnect (ctx->serial, ctx->buffer_full_id);
ctx->buffer_full_id = 0;
}
if (mm_port_serial_is_open (ctx->serial))
mm_port_serial_close (ctx->serial);
g_clear_object (&ctx->serial);
}
}
static void
port_probe_run_context_free (PortProbeRunContext *ctx)
{
@@ -422,16 +437,7 @@ port_probe_run_context_free (PortProbeRunContext *ctx)
ctx->source_id = 0;
}
if (ctx->serial && ctx->buffer_full_id) {
g_signal_handler_disconnect (ctx->serial, ctx->buffer_full_id);
ctx->buffer_full_id = 0;
}
if (ctx->serial) {
if (mm_port_serial_is_open (ctx->serial))
mm_port_serial_close (ctx->serial);
g_object_unref (ctx->serial);
}
clear_probe_serial_port (ctx);
#if defined WITH_QMI
if (ctx->port_qmi) {
@@ -449,10 +455,8 @@ port_probe_run_context_free (PortProbeRunContext *ctx)
}
#endif
if (ctx->at_probing_cancellable)
g_object_unref (ctx->at_probing_cancellable);
if (ctx->cancellable)
g_object_unref (ctx->cancellable);
g_clear_object (&ctx->at_probing_cancellable);
g_clear_object (&ctx->cancellable);
g_slice_free (PortProbeRunContext, ctx);
}
@@ -799,15 +803,7 @@ serial_probe_qcdm (MMPortProbe *self)
mm_obj_dbg (self, "probing QCDM...");
/* If open, close the AT port */
if (ctx->serial) {
/* Explicitly clear the buffer full signal handler */
if (ctx->buffer_full_id) {
g_signal_handler_disconnect (ctx->serial, ctx->buffer_full_id);
ctx->buffer_full_id = 0;
}
mm_port_serial_close (ctx->serial);
g_object_unref (ctx->serial);
}
clear_probe_serial_port (ctx);
if (g_str_equal (mm_kernel_device_get_subsystem (self->priv->port), "wwan"))
subsys = MM_PORT_SUBSYS_WWAN;