summaryrefslogtreecommitdiffstats
path: root/fs/proc/proc_devtree.c
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2000-01-21 22:34:01 +0000
committerRalf Baechle <ralf@linux-mips.org>2000-01-21 22:34:01 +0000
commit9e30c3705aed9fbec4c3304570e4d6e707856bcb (patch)
treeb19e6acb5a67af31a4e7742e05c2166dc3f1444c /fs/proc/proc_devtree.c
parent72919904796333a20c6a5d5c380091b42e407aa9 (diff)
Merge with Linux 2.3.22.
Diffstat (limited to 'fs/proc/proc_devtree.c')
-rw-r--r--fs/proc/proc_devtree.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/proc/proc_devtree.c b/fs/proc/proc_devtree.c
index 140281015..c06a802ce 100644
--- a/fs/proc/proc_devtree.c
+++ b/fs/proc/proc_devtree.c
@@ -165,7 +165,7 @@ static void add_node(struct device_node *np, struct proc_dir_entry *de)
* add a symlink with the name property as its name.
*/
for (sib = np->child; sib != child; sib = sib->sibling)
- if (strcmp(sib->name, child->name) == 0)
+ if (sib->name && strcmp(sib->name, child->name) == 0)
break;
if (sib == child && strncmp(p, child->name, l) != 0) {
al = kmalloc(sizeof(struct proc_dir_entry),