| From c15e1bdda4365a5f17cdadf22bf1c1df13884a9e Mon Sep 17 00:00:00 2001 |
| From: Heikki Krogerus <heikki.krogerus@linux.intel.com> |
| Date: Fri, 21 Aug 2020 13:53:42 +0300 |
| Subject: device property: Fix the secondary firmware node handling in set_primary_fwnode() |
| |
| From: Heikki Krogerus <heikki.krogerus@linux.intel.com> |
| |
| commit c15e1bdda4365a5f17cdadf22bf1c1df13884a9e upstream. |
| |
| When the primary firmware node pointer is removed from a |
| device (set to NULL) the secondary firmware node pointer, |
| when it exists, is made the primary node for the device. |
| However, the secondary firmware node pointer of the original |
| primary firmware node is never cleared (set to NULL). |
| |
| To avoid situation where the secondary firmware node pointer |
| is pointing to a non-existing object, clearing it properly |
| when the primary node is removed from a device in |
| set_primary_fwnode(). |
| |
| Fixes: 97badf873ab6 ("device property: Make it possible to use secondary firmware nodes") |
| Cc: All applicable <stable@vger.kernel.org> |
| Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com> |
| Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/base/core.c | 12 ++++++++---- |
| 1 file changed, 8 insertions(+), 4 deletions(-) |
| |
| --- a/drivers/base/core.c |
| +++ b/drivers/base/core.c |
| @@ -2348,9 +2348,9 @@ static inline bool fwnode_is_primary(str |
| */ |
| void set_primary_fwnode(struct device *dev, struct fwnode_handle *fwnode) |
| { |
| - if (fwnode) { |
| - struct fwnode_handle *fn = dev->fwnode; |
| + struct fwnode_handle *fn = dev->fwnode; |
| |
| + if (fwnode) { |
| if (fwnode_is_primary(fn)) |
| fn = fn->secondary; |
| |
| @@ -2360,8 +2360,12 @@ void set_primary_fwnode(struct device *d |
| } |
| dev->fwnode = fwnode; |
| } else { |
| - dev->fwnode = fwnode_is_primary(dev->fwnode) ? |
| - dev->fwnode->secondary : NULL; |
| + if (fwnode_is_primary(fn)) { |
| + dev->fwnode = fn->secondary; |
| + fn->secondary = NULL; |
| + } else { |
| + dev->fwnode = NULL; |
| + } |
| } |
| } |
| EXPORT_SYMBOL_GPL(set_primary_fwnode); |