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

Do not add 'unset' UDev vendor or model information

Browse Source
This commit is contained in:
Richard Hughes 2022-06-15 11:59:19 +01:00
parent bf256a7ca7
commit 700ea6cf0d
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -461,23 +461,25 @@ fu_udev_device_probe(FuDevice *device, GError **error)
/* set vendor ID */
subsystem = g_ascii_strup(g_udev_device_get_subsystem(priv->udev_device), -1);
if (subsystem != NULL && priv->vendor != 0x0000) {
if (subsystem != NULL && priv->vendor != 0x0000 && priv->vendor != 0xFFFF) {
g_autofree gchar *vendor_id = NULL;
vendor_id = g_strdup_printf("%s:0x%04X", subsystem, (guint)priv->vendor);
fu_device_add_vendor_id(device, vendor_id);
}
/* add GUIDs in order of priority */
if (priv->vendor != 0x0000)
if (priv->vendor != 0x0000 && priv->vendor != 0xFFFF)
fu_device_add_instance_u16(device, "VEN", priv->vendor);
if (priv->model != 0x0000)
if (priv->model != 0x0000 && priv->model != 0xFFFF)
fu_device_add_instance_u16(device, "DEV", priv->model);
if (priv->subsystem_vendor != 0x0000 && priv->subsystem_model != 0x0000) {
if (priv->subsystem_vendor != 0x0000 && priv->subsystem_vendor != 0xFFFF &&
priv->subsystem_model != 0x0000 && priv->subsystem_model != 0xFFFF) {
g_autofree gchar *subsys =
g_strdup_printf("%04X%04X", priv->subsystem_vendor, priv->subsystem_model);
fu_device_add_instance_str(device, "SUBSYS", subsys);
}
fu_device_add_instance_u8(device, "REV", priv->revision);
if (priv->revision != 0xFF)
fu_device_add_instance_u8(device, "REV", priv->revision);
fu_device_build_instance_id_quirk(device, NULL, subsystem, "VEN", NULL);
fu_device_build_instance_id(device, NULL, subsystem, "VEN", "DEV", NULL);