projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'for-linus-4.12b-rc0c-tag' of git://git.kernel.org/pub/scm/linux/kernel...
[linux-2.6-microblaze.git]
/
scripts
/
dtc
/
dtc-parser.y
diff --git
a/scripts/dtc/dtc-parser.y
b/scripts/dtc/dtc-parser.y
index
b2fd4d1
..
ca3f500
100644
(file)
--- a/
scripts/dtc/dtc-parser.y
+++ b/
scripts/dtc/dtc-parser.y
@@
-171,10
+171,10
@@
devicetree:
{
struct node *target = get_node_by_ref($1, $3);
- add_label(&target->labels, $2);
- if (target)
+ if (target) {
+ add_label(&target->labels, $2);
merge_nodes(target, $4);
- else
+
}
else
ERROR(&@3, "Label or path %s not found", $3);
$$ = $1;
}