| From 47f4469970d8861bc06d2d4d45ac8200ff07c693 Mon Sep 17 00:00:00 2001 |
| From: Bard Liao <yung-chuan.liao@linux.intel.com> |
| Date: Tue, 5 Jan 2021 17:11:45 +0800 |
| Subject: Revert "device property: Keep secondary firmware node secondary by type" |
| |
| From: Bard Liao <yung-chuan.liao@linux.intel.com> |
| |
| commit 47f4469970d8861bc06d2d4d45ac8200ff07c693 upstream. |
| |
| While commit d5dcce0c414f ("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 |
| c15e1bdda436 ("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: d5dcce0c414f ("device property: Keep secondary firmware node secondary by type") |
| Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com> |
| Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> |
| Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com> |
| Cc: 5.10+ <stable@vger.kernel.org> # 5.10+ |
| Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/base/core.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/drivers/base/core.c |
| +++ b/drivers/base/core.c |
| @@ -2364,7 +2364,7 @@ void set_primary_fwnode(struct device *d |
| if (fwnode_is_primary(fn)) { |
| dev->fwnode = fn->secondary; |
| if (!(parent && fn == parent->fwnode)) |
| - fn->secondary = ERR_PTR(-ENODEV); |
| + fn->secondary = NULL; |
| } else { |
| dev->fwnode = NULL; |
| } |
