Browse Source

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 <linux@roeck-us.net>
Acked-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Cc: Thierry Reding <treding@nvidia.com>
Signed-off-by: Greg Kroah-Hartman gregkh@linuxfoundation.org
Greg Kroah-Hartman 9 years ago
parent
commit
112d125a89
1 changed files with 2 additions and 2 deletions
  1. 2 2
      drivers/base/platform.c

+ 2 - 2
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))