driver-core: platform: probe of-devices only using list of compatibles

There are several indications that make a platform device match a
platform driver. For devices that are instantiated by a device tree
matching by name, id table or acpi mechanisms doesn't make sense and
might result in surprising effects. So limit matching to use the
driver's of_match_table for these.

Acked-by: Thierry Reding <treding@nvidia.com>
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/base/platform.c b/drivers/base/platform.c
index f437afa17f2b1d2933ed0882d7e7f291c6d86309..1b5b7b5b50c0a96a8035dc8076b86790e1084914 100644 (file)
--- 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 (of_driver_match_device(dev, drv))
-               return 1;
+       if (pdev->dev.of_node)
+               return of_driver_match_device(dev, drv);
 
        /* Then try ACPI style match */
        if (acpi_driver_match_device(dev, drv))