2 files changed, 22 insertions, 3 deletions

diff --git a/drivers/base/bus.c b/drivers/base/bus.c
index dca734819e50..7ff5aafe2167 100644
--- a/drivers/base/bus.c
+++ b/drivers/base/bus.c
@@ -138,12 +138,24 @@ void bus_remove_file(struct bus_type * bus, struct bus_attribute * attr)
         }
 }
 
-static struct kobj_type ktype_bus = {
+static struct kobj_type bus_ktype = {
         .sysfs_ops      = &bus_sysfs_ops,
+};
+
+static int bus_uevent_filter(struct kset *kset, struct kobject *kobj)
+{
+        struct kobj_type *ktype = get_ktype(kobj);
+
+        if (ktype == &bus_ktype)
+                return 1;
+        return 0;
+}
 
+static struct kset_uevent_ops bus_uevent_ops = {
+        .filter = bus_uevent_filter,
 };
 
-static decl_subsys(bus, &ktype_bus, NULL);
+static decl_subsys(bus, &bus_ktype, &bus_uevent_ops);
 
 
 #ifdef CONFIG_HOTPLUG
diff --git a/lib/kobject.c b/lib/kobject.c
index ac1520651b9b..b4ebd7631700 100644
--- a/lib/kobject.c
+++ b/lib/kobject.c
@@ -597,10 +597,17 @@ int kset_add(struct kset * k)
 
 int kset_register(struct kset * k)
 {
+        int err;
+
         if (!k)
                 return -EINVAL;
+
         kset_init(k);
-        return kset_add(k);
+        err = kset_add(k);
+        if (err)
+                return err;
+        kobject_uevent(&k->kobj, KOBJ_ADD);
+        return 0;
 }