1 files changed, 22 insertions, 1 deletions

diff --git a/drivers/base/platform.c b/drivers/base/platform.c
index 62a8768d96b3..ec993aa6a2ca 100644
--- a/drivers/base/platform.c
+++ b/drivers/base/platform.c
@@ -584,10 +584,25 @@ static int platform_uevent(struct device *dev, struct kobj_uevent_env *env)
 {
         struct platform_device  *pdev = to_platform_device(dev);
 
-        add_uevent_var(env, "MODALIAS=platform:%s", pdev->name);
+        add_uevent_var(env, "MODALIAS=%s%s", PLATFORM_MODULE_PREFIX,
+                (pdev->id_entry) ? pdev->id_entry->name : pdev->name);
         return 0;
 }
 
+static const struct platform_device_id *platform_match_id(
+                        struct platform_device_id *id,
+                        struct platform_device *pdev)
+{
+        while (id->name[0]) {
+                if (strcmp(pdev->name, id->name) == 0) {
+                        pdev->id_entry = id;
+                        return id;
+                }
+                id++;
+        }
+        return NULL;
+}
+
 /**
  * platform_match - bind platform device to platform driver.
  * @dev: device.
@@ -604,7 +619,13 @@ static int platform_uevent(struct device *dev, struct kobj_uevent_env *env)
 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 */
+        if (pdrv->id_table)
+                return platform_match_id(pdrv->id_table, pdev) != NULL;
 
+        /* fall-back to driver name match */
         return (strcmp(pdev->name, drv->name) == 0);
 }