aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGrant Likely <grant.likely@secretlab.ca>2010-07-22 10:36:28 -0600
committerGrant Likely <grant.likely@secretlab.ca>2010-07-24 09:57:53 -0600
commitc1b6d380b781b5238989a4bfba02450057670804 (patch)
tree86f0acab0ce296b307150f25ab166191e5c3f6d1
parent295960429675e17ec658320ebb24385727032bed (diff)
of/device: Protect against binding of_platform_drivers to non-OF devices
There is an unlikely chance of this situation is occurring, but it is easy to protect against. If a matching entry cannot be found in the of_match_table, then don't bind the driver. Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
-rw-r--r--drivers/of/platform.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/of/platform.c b/drivers/of/platform.c
index 712dfd866df..f3f1ec81ef4 100644
--- a/drivers/of/platform.c
+++ b/drivers/of/platform.c
@@ -30,8 +30,13 @@ static int platform_driver_probe_shim(struct platform_device *pdev)
pdrv = container_of(pdev->dev.driver, struct platform_driver, driver);
ofpdrv = container_of(pdrv, struct of_platform_driver, platform_driver);
+
+ /* There is an unlikely chance that an of_platform driver might match
+ * on a non-OF platform device. If so, then of_match_device() will
+ * come up empty. Return -EINVAL in this case so other drivers get
+ * the chance to bind. */
match = of_match_device(pdev->dev.driver->of_match_table, &pdev->dev);
- return ofpdrv->probe(pdev, match);
+ return match ? ofpdrv->probe(pdev, match) : -EINVAL;
}
static void platform_driver_shutdown_shim(struct platform_device *pdev)