X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=lib%2Fkobject.c;h=b4ebd763170091841577e15f09646df96c3ff793;hb=80f03e349f06a261a8e980bf6005c61811a0d66a;hp=fc5f3f6e73299a27e394294efb4564dea3511c2c;hpb=5cefcab3db2b13093480f2a42bf081574dd72d3d;p=~andy%2Flinux diff --git a/lib/kobject.c b/lib/kobject.c index fc5f3f6e732..b4ebd763170 100644 --- a/lib/kobject.c +++ b/lib/kobject.c @@ -202,14 +202,14 @@ int kobject_shadow_add(struct kobject * kobj, struct dentry *shadow_parent) /* be noisy on error issues */ if (error == -EEXIST) - printk("kobject_add failed for %s with -EEXIST, " - "don't try to register things with the " - "same name in the same directory.\n", + printk(KERN_ERR "kobject_add failed for %s with " + "-EEXIST, don't try to register things with " + "the same name in the same directory.\n", kobject_name(kobj)); else - printk("kobject_add failed for %s (%d)\n", + printk(KERN_ERR "kobject_add failed for %s (%d)\n", kobject_name(kobj), error); - dump_stack(); + dump_stack(); } return error; @@ -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; }