diff options
| author | Sakari Ailus <sakari.ailus@linux.intel.com> | 2019-10-03 14:32:08 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2019-10-11 11:26:55 +0200 |
| commit | 51c100a651a471fcb8ead1ecc1224471eb0d61b9 (patch) | |
| tree | c693be830e5cf2a06edbbab8a9b702fde67f2571 /drivers/base/swnode.c | |
| parent | Linux 5.4-rc2 (diff) | |
| download | linux-51c100a651a471fcb8ead1ecc1224471eb0d61b9.tar.xz linux-51c100a651a471fcb8ead1ecc1224471eb0d61b9.zip | |
software node: Get reference to parent swnode in get_parent op
The software_node_get_parent() returned a pointer to the parent swnode,
but did not take a reference to it, leading the caller to put a reference
that was not taken. Take that reference now.
Fixes: 59abd83672f7 ("drivers: base: Introducing software nodes to the firmware node framework")
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/base/swnode.c')
| -rw-r--r-- | drivers/base/swnode.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/base/swnode.c b/drivers/base/swnode.c index a1f3f0994f9f..d5b4905e2adb 100644 --- a/drivers/base/swnode.c +++ b/drivers/base/swnode.c @@ -520,7 +520,10 @@ software_node_get_parent(const struct fwnode_handle *fwnode) { struct swnode *swnode = to_swnode(fwnode); - return swnode ? (swnode->parent ? &swnode->parent->fwnode : NULL) : NULL; + if (!swnode || !swnode->parent) + return NULL; + + return fwnode_handle_get(&swnode->parent->fwnode); } static struct fwnode_handle * |