From 1423021f97d51a06844cfbc30cacc97955e7cd2d Mon Sep 17 00:00:00 2001 From: Arnaud Ferraris Date: Fri, 11 Dec 2020 15:11:22 +0100 Subject: [PATCH] d/patches: drop upstreamed patches --- ...e-don-t-reset-USB-ID-unless-quitting.patch | 55 ------------------- debian/patches/series | 1 - 2 files changed, 56 deletions(-) delete mode 100644 debian/patches/0001-mm-iface-don-t-reset-USB-ID-unless-quitting.patch delete mode 100644 debian/patches/series diff --git a/debian/patches/0001-mm-iface-don-t-reset-USB-ID-unless-quitting.patch b/debian/patches/0001-mm-iface-don-t-reset-USB-ID-unless-quitting.patch deleted file mode 100644 index 9472f62..0000000 --- a/debian/patches/0001-mm-iface-don-t-reset-USB-ID-unless-quitting.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 6ab5156dfacbf5d98f0c3c2e991cbe1cf85ca9e6 Mon Sep 17 00:00:00 2001 -From: Arnaud Ferraris -Date: Fri, 11 Dec 2020 14:31:20 +0100 -Subject: [PATCH] mm-iface: don't reset USB ID unless quitting - -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. ---- - src/mm-iface.c | 15 +++++---------- - 1 file changed, 5 insertions(+), 10 deletions(-) - -diff --git a/src/mm-iface.c b/src/mm-iface.c -index f1021de..f6ec6eb 100644 ---- a/src/mm-iface.c -+++ b/src/mm-iface.c -@@ -84,13 +84,8 @@ static void interface_removed_cb(struct EG25Manager *manager, - - 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; -- 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); - - 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); - 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) { - g_bus_unwatch_name(manager->mm_watch); - manager->mm_watch = 0; --- -2.29.2 - diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index ab851ee..0000000 --- a/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -0001-mm-iface-don-t-reset-USB-ID-unless-quitting.patch