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

[linux.git] / drivers / acpi / acpi_lpss.c

diff --git a/drivers/acpi/acpi_lpss.c b/drivers/acpi/acpi_lpss.c
index 125ef7db86ff98a9925f650e1884aa5a64546b28..73ae43627d603eb9e5a71e505227f661a0d8bf5c 100644 (file)
--- a/drivers/acpi/acpi_lpss.c
+++ b/drivers/acpi/acpi_lpss.c
@@ -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,