From 02b588c0351a522e882e72569f2cbc9990ccf3d7 Mon Sep 17 00:00:00 2001 From: Richard Hughes Date: Wed, 8 Apr 2020 13:57:00 +0100 Subject: [PATCH] Fix a crash when removing device parents This was missed for the conversion of 1e571730d0b39574c3d7f2d0cc38e7c859205dbc --- src/fu-device-list.c | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/src/fu-device-list.c b/src/fu-device-list.c index 216a84429..9d1e7eb40 100644 --- a/src/fu-device-list.c +++ b/src/fu-device-list.c @@ -357,17 +357,7 @@ fu_device_list_device_delayed_remove_cb (gpointer user_data) children = fu_device_get_children (item->device); for (guint j = 0; j < children->len; j++) { FuDevice *child = g_ptr_array_index (children, j); - FuDeviceItem *child_item = fu_device_list_find_by_id (self, - fu_device_get_id (child), - NULL); - if (child_item == NULL) { - g_debug ("device %s not found", fu_device_get_id (child)); - continue; - } fu_device_list_emit_device_removed (self, child); - g_rw_lock_writer_lock (&self->devices_mutex); - g_ptr_array_remove (self->devices, child_item); - g_rw_lock_writer_unlock (&self->devices_mutex); } /* just remove now */ @@ -443,17 +433,7 @@ fu_device_list_remove (FuDeviceList *self, FuDevice *device) children = fu_device_get_children (device); for (guint j = 0; j < children->len; j++) { FuDevice *child = g_ptr_array_index (children, j); - FuDeviceItem *child_item = fu_device_list_find_by_id (self, - fu_device_get_id (child), - NULL); - if (child_item == NULL) { - g_debug ("device %s not found", fu_device_get_id (child)); - continue; - } fu_device_list_emit_device_removed (self, child); - g_rw_lock_writer_lock (&self->devices_mutex); - g_ptr_array_remove (self->devices, child_item); - g_rw_lock_writer_unlock (&self->devices_mutex); } /* remove right now */