X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=drivers%2Fbase%2Fcore.c;fp=drivers%2Fbase%2Fcore.c;h=b7d56c5ea3c688fe03c7b5edda4f62c0906a9fc7;hb=56f2de81e020c537f7e35550d13840143cb765cd;hp=334ec7ef1960cf46b69a27315a1dbcccbf39dd8b;hpb=6713e8fb541656d00249dca6627395b461c39ece;p=firefly-linux-kernel-4.4.55.git

diff --git a/drivers/base/core.c b/drivers/base/core.c
index 334ec7ef1960..b7d56c5ea3c6 100644
--- 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. */