---

yaml --- r: 204927 b: refs/heads/master c: 0521215 h: refs/heads/master i: 204925: 1ddc683 204923: 9de45d8 204919: 55e2338 204911: 2f9da15 204895: d0578a5 204863: a56e24a 204799: 77a3bfc v: v3
git-mirror · Jul 24, 2010 · c0379c0 · c0379c0
1 parent 147cd8d
commit c0379c0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4e4f62bf7396fca48efe61513640ee399a6046e3
+refs/heads/master: 05212157e94ccf4cf458413bbba509cfa95ff92b
diff --git a/trunk/drivers/base/platform.c b/trunk/drivers/base/platform.c
@@ -12,6 +12,7 @@
 
 #include <linux/string.h>
 #include <linux/platform_device.h>
+#include <linux/of_device.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/dma-mapping.h>
@@ -673,7 +674,11 @@ static int platform_match(struct device *dev, struct device_driver *drv)
 	struct platform_device *pdev = to_platform_device(dev);
 	struct platform_driver *pdrv = to_platform_driver(drv);
 
-	/* match against the id table first */
+	/* Attempt an OF style match first */
+	if (of_driver_match_device(dev, drv))
+		return 1;
+
+	/* Then try to match against the id table */
 	if (pdrv->id_table)
 		return platform_match_id(pdrv->id_table, pdev) != NULL;