proxmox-mirrors/fwupd
1
0
Fork 0
mirror of https://git.proxmox.com/git/fwupd synced 2025-08-10 11:44:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

trivial: Always clear timeout when replacing in the devicelist

Browse Source
This commit is contained in:
Richard Hughes 2021-07-13 08:09:11 +01:00
parent 6578fb13e7
commit 9a4997e42b
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -87,7 +87,9 @@ fu_device_list_to_string (FuDeviceList *self)
FuDeviceItem *item = g_ptr_array_index (self->devices, i); FuDeviceItem *item = g_ptr_array_index (self->devices, i);
gboolean wfr; gboolean wfr;
g_string_append_printf (str, "%u [%p]\n", i, item); g_string_append_printf (str, "%u [%p] %s\n",
i, item,
item->remove_id != 0 ? "IN_TIMEOUT" : "");
wfr = fu_device_has_flag (item->device, wfr = fu_device_has_flag (item->device,
FWUPD_DEVICE_FLAG_WAIT_FOR_REPLUG); FWUPD_DEVICE_FLAG_WAIT_FOR_REPLUG);
g_string_append_printf (str, "new: %s [%p] %s\n", g_string_append_printf (str, "new: %s [%p] %s\n",
@ -576,6 +578,13 @@ fu_device_list_item_set_device (FuDeviceItem *item, FuDevice *device)
static void static void
fu_device_list_clear_wait_for_replug (FuDeviceList *self, FuDeviceItem *item) fu_device_list_clear_wait_for_replug (FuDeviceList *self, FuDeviceItem *item)
{ {
/* clear timeout if scheduled */
if (item->remove_id != 0) {
g_source_remove (item->remove_id);
item->remove_id = 0;
}
/* remove flag on both old and new devices */
if (fu_device_has_flag (item->device, FWUPD_DEVICE_FLAG_WAIT_FOR_REPLUG)) { if (fu_device_has_flag (item->device, FWUPD_DEVICE_FLAG_WAIT_FOR_REPLUG)) {
g_debug ("%s device came back, clearing flag", fu_device_get_id (item->device)); g_debug ("%s device came back, clearing flag", fu_device_get_id (item->device));
fu_device_remove_flag (item->device, FWUPD_DEVICE_FLAG_WAIT_FOR_REPLUG); fu_device_remove_flag (item->device, FWUPD_DEVICE_FLAG_WAIT_FOR_REPLUG);
@ -586,6 +595,8 @@ fu_device_list_clear_wait_for_replug (FuDeviceList *self, FuDeviceItem *item)
fu_device_remove_flag (item->device_old, FWUPD_DEVICE_FLAG_WAIT_FOR_REPLUG); fu_device_remove_flag (item->device_old, FWUPD_DEVICE_FLAG_WAIT_FOR_REPLUG);
} }
} }
/* optional debug */
if (g_getenv ("FWUPD_DEVICE_LIST_VERBOSE") != NULL) { if (g_getenv ("FWUPD_DEVICE_LIST_VERBOSE") != NULL) {
g_autofree gchar *str = fu_device_list_to_string (self); g_autofree gchar *str = fu_device_list_to_string (self);
g_debug ("\n%s", str); g_debug ("\n%s", str);
@ -598,12 +609,6 @@ fu_device_list_replace (FuDeviceList *self, FuDeviceItem *item, FuDevice *device
guint64 private_flags; guint64 private_flags;
GPtrArray *vendor_ids; GPtrArray *vendor_ids;
/* clear timeout if scheduled */
if (item->remove_id != 0) {
g_source_remove (item->remove_id);
item->remove_id = 0;
}
/* copy over any GUIDs that used to exist */ /* copy over any GUIDs that used to exist */
fu_device_list_add_missing_guids (device, item->device); fu_device_list_add_missing_guids (device, item->device);