diff options
| author | Greg Kroah-Hartman <greg@kroah.com> | 2004-07-14 03:00:00 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <greg@kroah.com> | 2004-07-14 03:00:00 -0700 |
| commit | 36208530bd9ed3758095549d77542ddd2f932bf0 (patch) | |
| tree | 8a7703ac0095894567a6da5aa9c8b72445c95dfe /lib | |
| parent | 9e9c96deae089852ac33db3066be53b1060355ac (diff) | |
| parent | 3b08aa6456c9046529ed38556b1950145eb7aa7a (diff) | |
Merge kroah.com:/home/greg/linux/BK/bleed-2.6
into kroah.com:/home/greg/linux/BK/driver-2.6
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/kobject.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/kobject.c b/lib/kobject.c index bcf4a9be0dcd..781f3e896695 100644 --- a/lib/kobject.c +++ b/lib/kobject.c @@ -537,7 +537,8 @@ void kset_unregister(struct kset * k) * @name: object's name. * * Lock kset via @kset->subsys, and iterate over @kset->list, - * looking for a matching kobject. Return object if found. + * looking for a matching kobject. If matching object is found + * take a reference and return the object. */ struct kobject * kset_find_obj(struct kset * kset, const char * name) @@ -548,8 +549,8 @@ struct kobject * kset_find_obj(struct kset * kset, const char * name) down_read(&kset->subsys->rwsem); list_for_each(entry,&kset->list) { struct kobject * k = to_kobj(entry); - if (kobject_name(k) && (!strcmp(kobject_name(k),name))) { - ret = k; + if (kobject_name(k) && !strcmp(kobject_name(k),name)) { + ret = kobject_get(k); break; } } |