38 lines
1.4 KiB
Diff
38 lines
1.4 KiB
Diff
From e95140e9137c920638649b6d3fe4878176cd92fd Mon Sep 17 00:00:00 2001
|
|
From: Aleksander Morgado <aleksander@aleksander.es>
|
|
Date: Wed, 13 Nov 2019 18:20:27 +0100
|
|
Subject: [PATCH] iface-modem-simple: don't assert ongoing connect cancellable
|
|
|
|
[11642]: <debug> [1573665255.321490] Couldn't reload current power state: QMI operation failed: Transaction timed out
|
|
[11642]: <debug> [1573665255.321697] No need to change power state: already in 'on' power state
|
|
[11642]: <debug> [1573665255.330864] Modem (Quectel) '/sys/devices/platform/ehci-platform/usb1/1-1' completely disposed
|
|
**
|
|
ERROR:mm-iface-modem-simple.c:44:private_free: assertion failed: (!priv->ongoing_connect)
|
|
|
|
If the modem goes away in the middle of a connection attempt, there's
|
|
no explicit connection cancellation performed, we just cleanup the
|
|
modem object. In this case, the ongoing attempt cancellable will still
|
|
exist, so just clean it up as well.
|
|
|
|
(cherry picked from commit 5e8c64d092e85f6d5479675499463464e1a42de6)
|
|
---
|
|
src/mm-iface-modem-simple.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/src/mm-iface-modem-simple.c b/src/mm-iface-modem-simple.c
|
|
index 893c470c..1e29c3ce 100644
|
|
--- a/src/mm-iface-modem-simple.c
|
|
+++ b/src/mm-iface-modem-simple.c
|
|
@@ -41,7 +41,7 @@ typedef struct {
|
|
static void
|
|
private_free (Private *priv)
|
|
{
|
|
- g_assert (!priv->ongoing_connect);
|
|
+ g_clear_object (&priv->ongoing_connect);
|
|
g_slice_free (Private, priv);
|
|
}
|
|
|
|
--
|
|
2.29.2
|
|
|