summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <greg@kroah.com>2004-12-02 20:40:41 -0800
committerLinus Torvalds <torvalds@ppc970.osdl.org>2004-12-02 20:40:41 -0800
commitea2e10e57a47bc786f37f3737d35f0144ac06d45 (patch)
tree52d53c757590cffa27c10207655e9e616d4aa431
parent01eb4811efe377ac2311329186e61f2392dee75c (diff)
[PATCH] Driver Core: restore comment in kobject_uevent.c
Signed-off-by: Kay Sievers <kay.sievers@vrfy.org> Signed-off-by: Greg Kroah-Hartman <greg@kroah.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--drivers/base/class_simple.c2
-rw-r--r--lib/kobject_uevent.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/drivers/base/class_simple.c b/drivers/base/class_simple.c
index 3410636de0a5..8a3b8fa7ed5b 100644
--- a/drivers/base/class_simple.c
+++ b/drivers/base/class_simple.c
@@ -122,7 +122,7 @@ EXPORT_SYMBOL(class_simple_destroy);
* be created, showing the dev_t for the device. The pointer to the struct
* class_device will be returned from the call. Any further sysfs files that
* might be required can be created using this pointer.
- * Note: the struct class_device passed to this function must have previously been
+ * Note: the struct class_simple passed to this function must have previously been
* created with a call to class_simple_create().
*/
struct class_device *class_simple_device_add(struct class_simple *cs, dev_t dev, struct device *device, const char *fmt, ...)
diff --git a/lib/kobject_uevent.c b/lib/kobject_uevent.c
index d29774362812..5c78b2187ce2 100644
--- a/lib/kobject_uevent.c
+++ b/lib/kobject_uevent.c
@@ -205,6 +205,8 @@ void kobject_hotplug(struct kobject *kobj, enum kobject_action action)
static struct kset_hotplug_ops null_hotplug_ops;
struct kset_hotplug_ops *hotplug_ops = &null_hotplug_ops;
+ /* If this kobj does not belong to a kset,
+ try to find a parent that does. */
if (!top_kobj->kset && top_kobj->parent) {
do {
top_kobj = top_kobj->parent;