git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'topic/usb' into for-linus
[pandora-kernel.git]
/
fs
/
sysfs
/
group.c
diff --git
a/fs/sysfs/group.c
b/fs/sysfs/group.c
index
eeba384
..
fe61194
100644
(file)
--- a/
fs/sysfs/group.c
+++ b/
fs/sysfs/group.c
@@
-134,9
+134,8
@@
void sysfs_remove_group(struct kobject * kobj,
if (grp->name) {
sd = sysfs_get_dirent(dir_sd, grp->name);
if (!sd) {
if (grp->name) {
sd = sysfs_get_dirent(dir_sd, grp->name);
if (!sd) {
-
printk(
KERN_WARNING "sysfs group %p not found for "
+
WARN(!sd,
KERN_WARNING "sysfs group %p not found for "
"kobject '%s'\n", grp, kobject_name(kobj));
"kobject '%s'\n", grp, kobject_name(kobj));
- WARN_ON(!sd);
return;
}
} else
return;
}
} else