diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2023-12-08 21:34:58 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2023-12-08 21:34:58 +0100 |
| commit | 3814876467e7557ccb1eecc28cf7f68d029f445e (patch) | |
| tree | 9955c500b9bd0aadc6bd97129aea19c6dd066e7d /drivers/firmware/efi/dev-path-parser.c | |
| parent | 8f0b960a42badda7a2781e8a33564624200debc9 (diff) | |
| parent | 38dd7b72ef8046a3009ef384b711d4509de3d427 (diff) | |
Merge back earlier acpi-utils material for v6.8.
Diffstat (limited to 'drivers/firmware/efi/dev-path-parser.c')
| -rw-r--r-- | drivers/firmware/efi/dev-path-parser.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/firmware/efi/dev-path-parser.c b/drivers/firmware/efi/dev-path-parser.c index f80d87c199c3..937be269fee8 100644 --- a/drivers/firmware/efi/dev-path-parser.c +++ b/drivers/firmware/efi/dev-path-parser.c @@ -18,8 +18,6 @@ static long __init parse_acpi_path(const struct efi_dev_path *node, struct acpi_device *adev; struct device *phys_dev; char hid[ACPI_ID_LEN]; - u64 uid; - int ret; if (node->header.length != 12) return -EINVAL; @@ -31,10 +29,9 @@ static long __init parse_acpi_path(const struct efi_dev_path *node, node->acpi.hid >> 16); for_each_acpi_dev_match(adev, hid, NULL, -1) { - ret = acpi_dev_uid_to_integer(adev, &uid); - if (ret == 0 && node->acpi.uid == uid) + if (acpi_dev_uid_match(adev, node->acpi.uid)) break; - if (ret == -ENODATA && node->acpi.uid == 0) + if (!acpi_device_uid(adev) && node->acpi.uid == 0) break; } if (!adev) |