2 files changed, 4 insertions, 2 deletions

diff --git a/drivers/base/core.c b/drivers/base/core.c
index 34ac18778d8a..e13614241c9e 100644
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -589,7 +589,8 @@ int device_add(struct device *dev)
                 goto PMError;
         if ((error = bus_add_device(dev)))
                 goto BusError;
-        kobject_uevent(&dev->kobj, KOBJ_ADD);
+        if (!dev->uevent_suppress)
+                kobject_uevent(&dev->kobj, KOBJ_ADD);
         if ((error = bus_attach_device(dev)))
                 goto AttachError;
         if (parent)
diff --git a/include/linux/device.h b/include/linux/device.h
index e1e164f81eea..5ca1cdba563a 100644
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -399,9 +399,10 @@ struct device {
 
         /* class_device migration path */
         struct list_head        node;
-        struct class            *class;         /* optional*/
+        struct class            *class;
         dev_t                   devt;           /* dev_t, creates the sysfs "dev" */
         struct attribute_group  **groups;       /* optional groups */
+        int                     uevent_suppress;
 
         void    (*release)(struct device * dev);
 };