From: Greg Kroah-Hartman Date: Mon, 15 Feb 2016 20:52:59 +0000 (-0800) Subject: Revert "driver-core: platform: probe of-devices only using list of compatibles" X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=112d125a89479519efc437b2961b8d4a98761c1b;p=linux-beck.git Revert "driver-core: platform: probe of-devices only using list of compatibles" This reverts commit 67d02a1bbb334558e9380409a3cd426b36d4578b This should reallow binding of of-devices by name. It turned out that there are valid reasons (e.g. step by step conversion to device tree probing using auxdata) to bind of-instantiated devices to drivers by name. So revert to the original logic. Reported-by: Guenter Roeck Acked-by: Uwe Kleine-König Cc: Thierry Reding Signed-off-by: Greg Kroah-Hartman gregkh@linuxfoundation.org --- diff --git a/drivers/base/platform.c b/drivers/base/platform.c index 1b5b7b5b50c0..f437afa17f2b 100644 --- a/drivers/base/platform.c +++ b/drivers/base/platform.c @@ -949,8 +949,8 @@ static int platform_match(struct device *dev, struct device_driver *drv) return !strcmp(pdev->driver_override, drv->name); /* Attempt an OF style match first */ - if (pdev->dev.of_node) - return of_driver_match_device(dev, drv); + if (of_driver_match_device(dev, drv)) + return 1; /* Then try ACPI style match */ if (acpi_driver_match_device(dev, drv))