From f1dff71a6f0c5cb1974a255397f2b8f713a6352e Mon Sep 17 00:00:00 2001
From: Kay Sievers <kay.sievers@vrfy.org>
Date: Sat, 26 May 2007 11:21:36 +0200
Subject: [PATCH] --- yaml --- r: 59093 b: refs/heads/master c:
 80f03e349f06a261a8e980bf6005c61811a0d66a h: refs/heads/master i:   59091:
 e665a44034be9257139a5f296968ee7c1b7276ee v: v3

---
 [refs]                   |  2 +-
 trunk/drivers/base/bus.c | 16 ++++++++++++++--
 trunk/lib/kobject.c      |  9 ++++++++-
 3 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 97961505c756..dac0deff2efa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4f5c791a850e5305a5b1b48d0e4b4de248dc96f9
+refs/heads/master: 80f03e349f06a261a8e980bf6005c61811a0d66a
diff --git a/trunk/drivers/base/bus.c b/trunk/drivers/base/bus.c
index dca734819e50..7ff5aafe2167 100644
--- a/trunk/drivers/base/bus.c
+++ b/trunk/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/trunk/lib/kobject.c b/trunk/lib/kobject.c
index ac1520651b9b..b4ebd7631700 100644
--- a/trunk/lib/kobject.c
+++ b/trunk/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;
 }