diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2012-05-12 18:53:34 -0400 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2012-05-12 18:53:34 -0400 |
| commit | 163ec0369be4c26e68385f6cec88d0ee38c8d8e5 (patch) | |
| tree | f3e441866f8bc1b0548e7d8eddd9548b6aedef5e /lib/kobject.c | |
| parent | 199642bfe107c411f25fbfc16c9fd49cfef9785d (diff) | |
| parent | 99dbdd98f271899e023d52b3f4c2bf67cdd7eb56 (diff) | |
Merge branch 'next/cleanup-plat-s3c24xx' into next/cleanup-plat-s3c24xx-s5p
Diffstat (limited to 'lib/kobject.c')
| -rw-r--r-- | lib/kobject.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/lib/kobject.c b/lib/kobject.c index 21dee7c19afd..aeefa8bc8b1c 100644 --- a/lib/kobject.c +++ b/lib/kobject.c | |||
| @@ -192,14 +192,14 @@ static int kobject_add_internal(struct kobject *kobj) | |||
| 192 | 192 | ||
| 193 | /* be noisy on error issues */ | 193 | /* be noisy on error issues */ |
| 194 | if (error == -EEXIST) | 194 | if (error == -EEXIST) |
| 195 | printk(KERN_ERR "%s failed for %s with " | 195 | WARN(1, "%s failed for %s with " |
| 196 | "-EEXIST, don't try to register things with " | 196 | "-EEXIST, don't try to register things with " |
| 197 | "the same name in the same directory.\n", | 197 | "the same name in the same directory.\n", |
| 198 | __func__, kobject_name(kobj)); | 198 | __func__, kobject_name(kobj)); |
| 199 | else | 199 | else |
| 200 | printk(KERN_ERR "%s failed for %s (%d)\n", | 200 | WARN(1, "%s failed for %s (error: %d parent: %s)\n", |
| 201 | __func__, kobject_name(kobj), error); | 201 | __func__, kobject_name(kobj), error, |
| 202 | dump_stack(); | 202 | parent ? kobject_name(parent) : "'none'"); |
| 203 | } else | 203 | } else |
| 204 | kobj->state_in_sysfs = 1; | 204 | kobj->state_in_sysfs = 1; |
| 205 | 205 | ||