LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Greg Kroah-Hartman <gregkh@suse.de>
To: linux-kernel@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@suse.de>,
	Kay Sievers <kay.sievers@vrfy.org>,
	Hannes Reinecke <hare@suse.de>
Subject: [PATCH 3/8] kobject: properly initialize ksets
Date: Tue,  4 Mar 2008 15:18:47 -0800	[thread overview]
Message-ID: <1204672732-3127-3-git-send-email-gregkh@suse.de> (raw)
In-Reply-To: <20080304231519.GC3073@suse.de>

kset_initialize was calling kobject_init_internal() which didn't
initialize the kobject as well as kobject_init() was.  So have
kobject_init() call kobject_init_internal() and move the logic to
initalize the kobject there.

Cc: Kay Sievers <kay.sievers@vrfy.org>
Cc: Hannes Reinecke <hare@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
 lib/kobject.c |   11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/lib/kobject.c b/lib/kobject.c
index d784dae..0d03252 100644
--- a/lib/kobject.c
+++ b/lib/kobject.c
@@ -153,6 +153,10 @@ static void kobject_init_internal(struct kobject *kobj)
 		return;
 	kref_init(&kobj->kref);
 	INIT_LIST_HEAD(&kobj->entry);
+	kobj->state_in_sysfs = 0;
+	kobj->state_add_uevent_sent = 0;
+	kobj->state_remove_uevent_sent = 0;
+	kobj->state_initialized = 1;
 }
 
 
@@ -289,13 +293,8 @@ void kobject_init(struct kobject *kobj, struct kobj_type *ktype)
 		dump_stack();
 	}
 
-	kref_init(&kobj->kref);
-	INIT_LIST_HEAD(&kobj->entry);
+	kobject_init_internal(kobj);
 	kobj->ktype = ktype;
-	kobj->state_in_sysfs = 0;
-	kobj->state_add_uevent_sent = 0;
-	kobj->state_remove_uevent_sent = 0;
-	kobj->state_initialized = 1;
 	return;
 
 error:
-- 
1.5.4.3


  parent reply	other threads:[~2008-03-04 23:25 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-03-04 23:15 [GIT PATCH] driver core fixes against 2.6.25-rc3 git Greg KH
2008-03-04 23:18 ` [PATCH 1/8] driver core: fix up Kconfig text for CONFIG_SYSFS_DEPRECATED Greg Kroah-Hartman
2008-03-05 15:58   ` Valdis.Kletnieks
2008-03-05 16:05     ` Greg KH
2008-03-05 21:24       ` Valdis.Kletnieks
2008-03-04 23:18 ` [PATCH 2/8] sysfs: CONFIG_SYSFS_DEPRECATED fix Greg Kroah-Hartman
2008-03-04 23:18 ` Greg Kroah-Hartman [this message]
2008-03-04 23:18 ` [PATCH 4/8] PM: Do not acquire device semaphores upfront during suspend Greg Kroah-Hartman
2008-03-04 23:18 ` [PATCH 5/8] PM: fix new mutex-locking bug in the PM core Greg Kroah-Hartman
2008-03-04 23:18 ` [PATCH 6/8] driver core: Remove dpm_sysfs_remove() from error path of device_add() Greg Kroah-Hartman
2008-03-04 23:18 ` [PATCH 7/8] Driver core: Fix cleanup when failing device_add() Greg Kroah-Hartman
2008-03-04 23:18 ` [PATCH 8/8] debugfs: fix sparse warnings Greg Kroah-Hartman

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1204672732-3127-3-git-send-email-gregkh@suse.de \
    --to=gregkh@suse.de \
    --cc=hare@suse.de \
    --cc=kay.sievers@vrfy.org \
    --cc=linux-kernel@vger.kernel.org \
    --subject='Re: [PATCH 3/8] kobject: properly initialize ksets' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).