Merge remote-tracking branch 'trivial/for-next'

[karo-tx-linux.git] / drivers / base / core.c

diff --git a/drivers/base/core.c b/drivers/base/core.c
index df20db26702b61abdb915329bb9ef1571603f879..b405b773adec1b4128ed0b3fdb38ebf2272290e9 100644 (file)
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -2261,7 +2261,10 @@ void set_primary_fwnode(struct device *dev, struct fwnode_handle *fwnode)
                if (fwnode_is_primary(fn))
                        fn = fn->secondary;
 
-               fwnode->secondary = fn;
+               if (fn) {
+                       WARN_ON(fwnode->secondary);
+                       fwnode->secondary = fn;
+               }
                dev->fwnode = fwnode;
        } else {
                dev->fwnode = fwnode_is_primary(dev->fwnode) ?