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

Revert "Speed up daemon startup by 650ms"

Browse Source 
This reverts commit a7642a7b7e.

I forgot that we need the TYPE, DRIVER and most importantly subsystem
for PossiblePlugin quirk matches. We need something more subtle.
This commit is contained in:
Richard Hughes 2022-06-07 19:11:57 +01:00
parent 8a706b470a
commit 165ce50614
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libfwupdplugin/fu-udev-device.c
View File

@ -382,10 +382,6 @@ fu_udev_device_probe(FuDevice *device, GError **error)
} }
} }
/* no instance IDs are going to match */
if (priv->vendor == 0x0000 || priv->model == 0x0000)
return TRUE;
/* set the version if the revision has been set */ /* set the version if the revision has been set */
if (fu_device_get_version(device) == NULL && if (fu_device_get_version(device) == NULL &&
fu_device_get_version_format(device) == FWUPD_VERSION_FORMAT_UNKNOWN) { fu_device_get_version_format(device) == FWUPD_VERSION_FORMAT_UNKNOWN) {
@ -453,16 +449,18 @@ fu_udev_device_probe(FuDevice *device, GError **error)
/* set vendor ID */ /* set vendor ID */
subsystem = g_ascii_strup(g_udev_device_get_subsystem(priv->udev_device), -1); subsystem = g_ascii_strup(g_udev_device_get_subsystem(priv->udev_device), -1);
if (subsystem != NULL) { if (subsystem != NULL && priv->vendor != 0x0000) {
g_autofree gchar *vendor_id = NULL; g_autofree gchar *vendor_id = NULL;
vendor_id = g_strdup_printf("%s:0x%04X", subsystem, (guint)priv->vendor); vendor_id = g_strdup_printf("%s:0x%04X", subsystem, (guint)priv->vendor);
fu_device_add_vendor_id(device, vendor_id); fu_device_add_vendor_id(device, vendor_id);
} }
/* add GUIDs in order of priority */ /* add GUIDs in order of priority */
if (priv->vendor != 0x0000)
fu_device_add_instance_u16(device, "VEN", priv->vendor); fu_device_add_instance_u16(device, "VEN", priv->vendor);
if (priv->model != 0x0000)
fu_device_add_instance_u16(device, "DEV", priv->model); fu_device_add_instance_u16(device, "DEV", priv->model);
if (priv->subsystem_vendor != 0x0000) { if (priv->subsystem_vendor != 0x0000 && priv->subsystem_model != 0x0000) {
g_autofree gchar *subsys = g_autofree gchar *subsys =
g_strdup_printf("%04X%04X", priv->subsystem_vendor, priv->subsystem_model); g_strdup_printf("%04X%04X", priv->subsystem_vendor, priv->subsystem_model);
fu_device_add_instance_str(device, "SUBSYS", subsys); fu_device_add_instance_str(device, "SUBSYS", subsys);