dany/eg25-manager
1
0
Fork 0
mirror of https://gitlab.com/mobian1/eg25-manager.git synced 2025-08-29 15:22:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

mm-iface: don't reset USB ID unless quitting

Browse Source 
As ModemManager releases the modem while going to sleep, we clear the
USB ID too, which causes a segfault when trying to recover the modem.
This commit is contained in:
Arnaud Ferraris
2020-12-11 14:31:20 +01:00
parent a9725243ec
commit 5fa345ec92
1 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/mm-iface.c
View File

@@ -84,13 +84,8 @@ static void interface_removed_cb(struct EG25Manager *manager,
g_message("ModemManager interface `%s' removed on object `%s'", info->name, path); g_message("ModemManager interface `%s' removed on object `%s'", info->name, path);
if (g_strcmp0(info->name, MM_DBUS_INTERFACE_MODEM) == 0) { if (g_strcmp0(info->name, MM_DBUS_INTERFACE_MODEM) == 0)
manager->mm_modem = NULL; manager->mm_modem = NULL;
if (manager->modem_usb_id) {
g_free(manager->modem_usb_id);
manager->modem_usb_id = NULL;
}
}
} }
@@ -133,10 +128,6 @@ static void object_removed_cb(struct EG25Manager *manager, GDBusObject *object)
g_message("ModemManager object `%s' removed", path); g_message("ModemManager object `%s' removed", path);
manager->mm_modem = NULL; manager->mm_modem = NULL;
if (manager->modem_usb_id) {
g_free(manager->modem_usb_id);
manager->modem_usb_id = NULL;
}
} }
@@ -196,6 +187,10 @@ void mm_iface_destroy(struct EG25Manager *manager)
g_clear_object(&manager->mm_manager); g_clear_object(&manager->mm_manager);
manager->mm_manager = NULL; manager->mm_manager = NULL;
} }
if (manager->modem_usb_id) {
g_free(manager->modem_usb_id);
manager->modem_usb_id = NULL;
}
if (manager->mm_watch != 0) { if (manager->mm_watch != 0) {
g_bus_unwatch_name(manager->mm_watch); g_bus_unwatch_name(manager->mm_watch);
manager->mm_watch = 0; manager->mm_watch = 0;