Commit a92a5563 authored Sep 23, 2018 by Hans de Goede Committed by Rafael J. Wysocki Sep 30, 2018

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>

parent ea625ce1

drivers/acpi/acpi_lpss.c

+7 −1

Original line number	Diff line number	Diff line
		@@ -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,

Admin message