Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 299092
b: refs/heads/master
c: 282029c
h: refs/heads/master
v: v3
  • Loading branch information
Dan Williams authored and Greg Kroah-Hartman committed Apr 10, 2012
1 parent 2ec2294 commit 8ccd314
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 3a198886ab5f228fcbebb9ace803d8b99721d49a
refs/heads/master: 282029c005e65ffdce3aa9f8220f88a8bbbc4dae
14 changes: 7 additions & 7 deletions trunk/lib/kobject.c
Original file line number Diff line number Diff line change
Expand Up @@ -192,14 +192,14 @@ static int kobject_add_internal(struct kobject *kobj)

/* be noisy on error issues */
if (error == -EEXIST)
printk(KERN_ERR "%s failed for %s with "
"-EEXIST, don't try to register things with "
"the same name in the same directory.\n",
__func__, kobject_name(kobj));
WARN(1, "%s failed for %s with "
"-EEXIST, don't try to register things with "
"the same name in the same directory.\n",
__func__, kobject_name(kobj));
else
printk(KERN_ERR "%s failed for %s (%d)\n",
__func__, kobject_name(kobj), error);
dump_stack();
WARN(1, "%s failed for %s (error: %d parent: %s)\n",
__func__, kobject_name(kobj), error,
parent ? kobject_name(parent) : "'none'");
} else
kobj->state_in_sysfs = 1;

Expand Down

0 comments on commit 8ccd314

Please sign in to comment.