proxmox-mirrors/fwupd
1
0
Fork 0
mirror of https://git.proxmox.com/git/fwupd synced 2025-08-07 12:25:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix a crash when removing device parents

Browse Source 
This was missed for the conversion of 1e571730d0
This commit is contained in:
Richard Hughes 2020-04-08 13:57:00 +01:00
parent 854e6f6362
commit 02b588c035
1 changed files with 0 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/fu-device-list.c
View File

@ -357,17 +357,7 @@ fu_device_list_device_delayed_remove_cb (gpointer user_data)
children = fu_device_get_children (item->device); children = fu_device_get_children (item->device);
for (guint j = 0; j < children->len; j++) { for (guint j = 0; j < children->len; j++) {
FuDevice *child = g_ptr_array_index (children, 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); 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 */ /* just remove now */
@ -443,17 +433,7 @@ fu_device_list_remove (FuDeviceList *self, FuDevice *device)
children = fu_device_get_children (device); children = fu_device_get_children (device);
for (guint j = 0; j < children->len; j++) { for (guint j = 0; j < children->len; j++) {
FuDevice *child = g_ptr_array_index (children, 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); 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 */ /* remove right now */