diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2006-05-20 18:00:30 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-05-21 15:59:21 -0400 |
commit | ae57a856429dd932c547530df1b234eb7e642297 (patch) | |
tree | 32745a24ad396bacc044793e984601dafc971776 | |
parent | b3969e5831adac133b286600e74214e1ae42ec05 (diff) |
[PATCH] kobject: quiet errors in kobject_add
People don't like released kernels yelling at them, no matter how real the
error might be. So only report it if CONFIG_KOBJECT_DEBUG is enabled.
Sent on request of Andrew Morton.
(akpm: should bring this back post-2.6.17)
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r-- | lib/kobject.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/kobject.c b/lib/kobject.c index b46350c27837..687ab418d292 100644 --- a/lib/kobject.c +++ b/lib/kobject.c | |||
@@ -198,14 +198,14 @@ int kobject_add(struct kobject * kobj) | |||
198 | 198 | ||
199 | /* be noisy on error issues */ | 199 | /* be noisy on error issues */ |
200 | if (error == -EEXIST) | 200 | if (error == -EEXIST) |
201 | printk("kobject_add failed for %s with -EEXIST, " | 201 | pr_debug("kobject_add failed for %s with -EEXIST, " |
202 | "don't try to register things with the " | 202 | "don't try to register things with the " |
203 | "same name in the same directory.\n", | 203 | "same name in the same directory.\n", |
204 | kobject_name(kobj)); | 204 | kobject_name(kobj)); |
205 | else | 205 | else |
206 | printk("kobject_add failed for %s (%d)\n", | 206 | pr_debug("kobject_add failed for %s (%d)\n", |
207 | kobject_name(kobj), error); | 207 | kobject_name(kobj), error); |
208 | dump_stack(); | 208 | /* dump_stack(); */ |
209 | } | 209 | } |
210 | 210 | ||
211 | return error; | 211 | return error; |