redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

ACPI / LPSS: Make hid_uid_match helper accept a NULL uid argument 

Make hid_uid_match helper accept a NULL uid argument, so that we can also
check for matches against devices with are not expected to have a uid such
as the LNXVIDEO device.

Tested-by: Jarkko Nikula <jarkko.nikula@linux.intel.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
hifive-unleashed-5.1
Hans de Goede 2018-09-23 15:58:07 +02:00 committed by Rafael J. Wysocki
parent ea625ce133
commit a92a5563e3
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/acpi/acpi_lpss.c
View File

@ -479,7 +479,13 @@ static bool hid_uid_match(struct acpi_device *adev,
const char *hid1 = acpi_device_hid(adev);
const char *uid1 = acpi_device_uid(adev);
return !strcmp(hid1, hid2) && uid1 && uid2 && !strcmp(uid1, uid2);
if (strcmp(hid1, hid2))
return false;
if (!uid2)
return true;
return uid1 && !strcmp(uid1, uid2);
}
static bool acpi_lpss_is_supplier(struct acpi_device *adev,