From: Dong Hao <[email protected]> The function printk() at end of function kobject_init() already had '\n', so remove it.
While the kobject has been initialized, assign error string and jump to error case directly. Signed-off-by: Dong Hao<[email protected]> --- lib/kobject.c | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/lib/kobject.c b/lib/kobject.c index c33d7a1..ef3d807 100644 --- a/lib/kobject.c +++ b/lib/kobject.c @@ -276,14 +276,13 @@ void kobject_init(struct kobject *kobj, struct kobj_type *ktype) goto error; } if (!ktype) { - err_str = "must have a ktype to be initialized properly!\n"; + err_str = "must have a ktype to be initialized properly!"; goto error; } if (kobj->state_initialized) { - /* do not error out as sometimes we can recover */ - printk(KERN_ERR "kobject (%p): tried to init an initialized " - "object, something is seriously wrong.\n", kobj); - dump_stack(); + err_str = "tried to init an initialized " + "object, something is seriously wrong."; + goto error; } kobject_init_internal(kobj); -- 1.7.2.5 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
