Commit e3cb82c6 authored Aug 21, 2020 by Andy Shevchenko Committed by Wolfram Sang Aug 25, 2020

i2c: core: Don't fail PRP0001 enumeration when no ID table exist

When commit c64ffff7 ("i2c: core: Allow empty id_table in ACPI case
as well") fixed the enumeration of I²C devices on ACPI enabled platforms
when driver has no ID table, it missed the PRP0001 support.

i2c_device_match() and i2c_acpi_match_device() differently match
driver against given device. Use acpi_driver_match_device(), that is used
in the former, in i2c_device_probe() and don't fail PRP0001 enumeration
when no ID table exist.

Fixes: c64ffff7 ("i2c: core: Allow empty id_table in ACPI case as well")
BugLink: https://stackoverflow.com/q/63519678/2511795


Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Signed-off-by: Wolfram Sang <wsa@kernel.org>

parent d012a719

drivers/i2c/i2c-core-base.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -480,7 +480,7 @@ static int i2c_device_probe(struct device *dev)
		* or ACPI ID table is supplied for the probing device.
		*/
		if (!driver->id_table &&
		!i2c_acpi_match_device(dev->driver->acpi_match_table, client) &&
		!acpi_driver_match_device(dev, dev->driver) &&
		!i2c_of_match_device(dev->driver->of_match_table, client)) {
		status = -ENODEV;
		goto put_sync_adapter;

Admin message