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

trivial: Do not show SATA drives as SCSI devices

Browse Source 
This fixes a regression in c4ca026294
which meant the 'vendor' sysfs attribute wasn't being stripped before
being used as the vendor ID.
This commit is contained in:
Richard Hughes 2022-03-11 12:31:53 +00:00
parent dd183e9b59
commit 4080ef637e
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/scsi/fu-scsi-device.c
View File

@ -21,6 +21,7 @@ fu_scsi_device_probe(FuDevice *device, GError **error)
const gchar *vendor; const gchar *vendor;
const gchar *version; const gchar *version;
g_autofree gchar *vendor_id = NULL; g_autofree gchar *vendor_id = NULL;
g_autofree gchar *vendor_safe = NULL;
g_autoptr(GPtrArray) block_devs = NULL; g_autoptr(GPtrArray) block_devs = NULL;
/* ignore */ /* ignore */
@ -34,7 +35,8 @@ fu_scsi_device_probe(FuDevice *device, GError **error)
/* vendor */ /* vendor */
vendor = fu_udev_device_get_sysfs_attr(FU_UDEV_DEVICE(device), "vendor", NULL); vendor = fu_udev_device_get_sysfs_attr(FU_UDEV_DEVICE(device), "vendor", NULL);
if (vendor == NULL || g_strcmp0(vendor, "ATA") == 0) { vendor_safe = fu_common_strstrip(vendor);
if (vendor_safe == NULL || g_strcmp0(vendor_safe, "ATA") == 0) {
g_set_error_literal(error, g_set_error_literal(error,
FWUPD_ERROR, FWUPD_ERROR,
FWUPD_ERROR_NOT_SUPPORTED, FWUPD_ERROR_NOT_SUPPORTED,
@ -42,7 +44,7 @@ fu_scsi_device_probe(FuDevice *device, GError **error)
return FALSE; return FALSE;
} }
fu_device_set_vendor(device, vendor); fu_device_set_vendor(device, vendor);
vendor_id = g_strdup_printf("SCSI:%s", vendor); vendor_id = g_strdup_printf("SCSI:%s", vendor_safe);
fu_device_add_vendor_id(device, vendor_id); fu_device_add_vendor_id(device, vendor_id);
/* name */ /* name */