projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
base
/
core.c
diff --git
a/drivers/base/core.c
b/drivers/base/core.c
index 334ec7ef1960cf46b69a27315a1dbcccbf39dd8b..b7d56c5ea3c688fe03c7b5edda4f62c0906a9fc7 100644
(file)
--- a/
drivers/base/core.c
+++ b/
drivers/base/core.c
@@
-1066,7
+1066,7
@@
int device_add(struct device *dev)
dev->kobj.parent = kobj;
/* use parent numa_node */
- if (parent)
+ if (parent
&& (dev_to_node(dev) == NUMA_NO_NODE)
)
set_dev_node(dev, dev_to_node(parent));
/* first, register with generic layer. */