Commit 47f44699 authored by Bard Liao's avatar Bard Liao Committed by Rafael J. Wysocki

Revert "device property: Keep secondary firmware node secondary by type"

While commit d5dcce0c ("device property: Keep secondary firmware
node secondary by type") describes everything correct in its commit
message, the change it made does the opposite and original commit
c15e1bdd ("device property: Fix the secondary firmware node handling
in set_primary_fwnode()") was fully correct.

Revert the former one here and improve documentation in the next patch.

Fixes: d5dcce0c ("device property: Keep secondary firmware node secondary by type")
Signed-off-by: default avatarBard Liao <yung-chuan.liao@linux.intel.com>
Reviewed-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: default avatarHeikki Krogerus <heikki.krogerus@linux.intel.com>
Cc: 5.10+ <stable@vger.kernel.org> # 5.10+
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent e71ba945
...@@ -4433,7 +4433,7 @@ void set_primary_fwnode(struct device *dev, struct fwnode_handle *fwnode) ...@@ -4433,7 +4433,7 @@ void set_primary_fwnode(struct device *dev, struct fwnode_handle *fwnode)
if (fwnode_is_primary(fn)) { if (fwnode_is_primary(fn)) {
dev->fwnode = fn->secondary; dev->fwnode = fn->secondary;
if (!(parent && fn == parent->fwnode)) if (!(parent && fn == parent->fwnode))
fn->secondary = ERR_PTR(-ENODEV); fn->secondary = NULL;
} else { } else {
dev->fwnode = NULL; dev->fwnode = NULL;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment