From: Hans de Goede <hdegoede@redhat.com>
Date: Sun, 23 Sep 2018 13:58:07 +0000 (+0200)
Subject: ACPI / LPSS: Make hid_uid_match helper accept a NULL uid argument
X-Git-Tag: v4.20-rc1~176^2~1^2~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a92a5563e3f4189b363de72527efdfaf4789167f;p=thirdparty%2Fkernel%2Flinux.git

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>
---

diff --git a/drivers/acpi/acpi_lpss.c b/drivers/acpi/acpi_lpss.c
index 125ef7db86ff9..73ae43627d603 100644
--- 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,