commit 94c8f3177c4c6b96122306fcd9916562cdbba317
author Ben Chan <benchan@chromium.org> Fri Feb 23 18:16:22 2018
committer Ben Chan <benchan@chromium.org> Fri Feb 23 18:16:22 2018
tree a43ccde195535ddf7dee1d2cf80fc46ddb626694
parent 60e9edc9566b91db4769c56d8c97461c25ac73b6
parent dc678bfef292728c9dfba2e9a9f27c555644c634

Merge remote-tracking branch 'cros/upstream' into 'cros/master'

Change-Id: I3aa6a2dd65bfec408affbb36272b2904f0d5086e

src/mm-base-manager.c

diff --git a/src/mm-base-manager.c b/src/mm-base-manager.c
index 4b92ab0..3c09089 100644
--- a/src/mm-base-manager.c
+++ b/src/mm-base-manager.c
@@ -220,18 +220,19 @@
         /* Handle tty/net/wdm port removal */
         device = find_device_by_port (self, kernel_device);
         if (device) {
-            mm_info ("(%s/%s): released by device '%s'", subsys, name, mm_device_get_uid (device));
-            mm_device_release_port (device, kernel_device);
+            /* The callbacks triggered when the port is released or device support is
+             * cancelled may end up unreffing the device or removing it from the HT, and
+             * so in order to make sure the reference is still valid when we call
+             * support_check_cancel() and g_hash_table_remove(), we hold a full reference
+             * ourselves. */
+            g_object_ref (device);
+            {
+                mm_info ("(%s/%s): released by device '%s'", subsys, name, mm_device_get_uid (device));
+                mm_device_release_port (device, kernel_device);
 
-            /* If port probe list gets empty, remove the device object iself */
-            if (!mm_device_peek_port_probe_list (device)) {
-                /* The callback triggered when the device support is cancelled may end up
-                 * removing the device from the HT, and that was the last full reference
-                 * we kept. So, in order to make sure the reference is still valid after
-                 * support_check_cancel(), we hold a full reference ourselves. */
-                mm_dbg ("Removing empty device '%s'", mm_device_get_uid (device));
-                g_object_ref (device);
-                {
+                /* If port probe list gets empty, remove the device object iself */
+                if (!mm_device_peek_port_probe_list (device)) {
+                    mm_dbg ("Removing empty device '%s'", mm_device_get_uid (device));
                     if (mm_plugin_manager_device_support_check_cancel (self->priv->plugin_manager, device))
                         mm_dbg ("Device support check has been cancelled");
 
@@ -240,8 +241,8 @@
                     mm_device_remove_modem (device);
                     g_hash_table_remove (self->priv->devices, mm_device_get_uid (device));
                 }
-                g_object_unref (device);
             }
+            g_object_unref (device);
         }
 
         return;