From: Grant Likely Date: Thu, 22 Jul 2010 16:36:28 +0000 (-0600) Subject: of/device: Protect against binding of_platform_drivers to non-OF devices X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=c1b6d380b781b5238989a4bfba02450057670804;p=linux-beck.git 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 --- diff --git a/drivers/of/platform.c b/drivers/of/platform.c index 712dfd866df0..f3f1ec81ef48 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)