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

trivial: Add SUBSYS instance data if *either* of the vendor or model are set

Browse Source
This commit is contained in:
Richard Hughes 2022-06-30 18:45:18 +01:00
parent ced79fce4a
commit d7479423a0
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -165,10 +165,10 @@ fu_udev_device_to_string(FuDevice *device, guint idt, GString *str)
fu_string_append_kx(str, idt, "Vendor", priv->vendor); fu_string_append_kx(str, idt, "Vendor", priv->vendor);
if (priv->model != 0x0) if (priv->model != 0x0)
fu_string_append_kx(str, idt, "Model", priv->model); fu_string_append_kx(str, idt, "Model", priv->model);
if (priv->subsystem_vendor != 0x0) if (priv->subsystem_vendor != 0x0 || priv->subsystem_model != 0x0) {
fu_string_append_kx(str, idt, "SubsystemVendor", priv->subsystem_vendor); fu_string_append_kx(str, idt, "SubsystemVendor", priv->subsystem_vendor);
if (priv->subsystem_model != 0x0)
fu_string_append_kx(str, idt, "SubsystemModel", priv->subsystem_model); fu_string_append_kx(str, idt, "SubsystemModel", priv->subsystem_model);
}
if (priv->revision != 0x0) if (priv->revision != 0x0)
fu_string_append_kx(str, idt, "Revision", priv->revision); fu_string_append_kx(str, idt, "Revision", priv->revision);
if (priv->subsystem != NULL) if (priv->subsystem != NULL)
@ -496,7 +496,7 @@ fu_udev_device_probe(FuDevice *device, GError **error)
fu_device_add_instance_u16(device, "VEN", priv->vendor); fu_device_add_instance_u16(device, "VEN", priv->vendor);
if (priv->model != 0x0000) 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 && priv->subsystem_model != 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);