linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Sakari Ailus <sakari.ailus@linux.intel.com>
To: Petr Mladek <pmladek@suse.com>,
	linux-kernel@vger.kernel.org, rafael@kernel.org
Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
	linux-acpi@vger.kernel.org, devicetree@vger.kernel.org,
	Rob Herring <robh@kernel.org>,
	Heikki Krogerus <heikki.krogerus@linux.intel.com>,
	Joe Perches <joe@perches.com>
Subject: [PATCH v6 02/12] software node: Get reference to parent swnode in get_parent op
Date: Tue, 10 Sep 2019 11:46:57 +0300	[thread overview]
Message-ID: <20190910084707.18380-3-sakari.ailus@linux.intel.com> (raw)
In-Reply-To: <20190910084707.18380-1-sakari.ailus@linux.intel.com>

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>
---
 drivers/base/swnode.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/base/swnode.c b/drivers/base/swnode.c
index e7b3aa3bd55ad..a7cb41812cfda 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 *
-- 
2.20.1


  parent reply	other threads:[~2019-09-10  8:47 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-09-10  8:46 [PATCH v6 00/12] Device property improvements, add %pfw format specifier Sakari Ailus
2019-09-10  8:46 ` [PATCH v6 01/12] tools lib traceevent: Convert remaining %p[fF] users to %p[sS] Sakari Ailus
2019-09-10  9:22   ` Andy Shevchenko
2019-09-10 11:18   ` Steven Rostedt
2019-09-10 17:18     ` Joe Perches
2019-09-10 18:26       ` Steven Rostedt
2019-09-10 18:42         ` Joe Perches
2019-09-10 19:03           ` Steven Rostedt
2019-09-10 19:44             ` Joe Perches
2019-09-16 11:41               ` Sakari Ailus
2019-09-16 14:37                 ` Steven Rostedt
2019-09-18 13:08                   ` Sakari Ailus
2019-09-10  8:46 ` Sakari Ailus [this message]
2019-09-10  8:46 ` [PATCH v6 03/12] software node: Make argument to to_software_node const Sakari Ailus
2019-09-10  8:46 ` [PATCH v6 04/12] device property: Move fwnode_get_parent() up Sakari Ailus
2019-09-10  8:47 ` [PATCH v6 05/12] device property: Add functions for accessing node's parents Sakari Ailus
2019-09-10  8:47 ` [PATCH v6 06/12] device property: Add fwnode_get_name for returning the name of a node Sakari Ailus
2019-09-10  8:47 ` [PATCH v6 07/12] device property: Add a function to obtain a node's prefix Sakari Ailus
2019-09-10  8:47 ` [PATCH v6 08/12] lib/vsprintf: Remove support for %pF and %pf in favour of %pS and %ps Sakari Ailus
2019-09-10  8:47 ` [PATCH v6 09/12] lib/vsprintf: Make use of fwnode API to obtain node names and separators Sakari Ailus
2019-09-10  8:47 ` [PATCH v6 10/12] lib/vsprintf: OF nodes are first and foremost, struct device_nodes Sakari Ailus
2019-09-10  8:47 ` [PATCH v6 11/12] lib/vsprintf: Add %pfw conversion specifier for printing fwnode names Sakari Ailus
2019-09-10 10:21   ` Joe Perches
2019-09-18 13:11     ` Sakari Ailus
2019-09-10  8:47 ` [PATCH v6 12/12] lib/test_printf: Add tests for %pfw printk modifier Sakari Ailus

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190910084707.18380-3-sakari.ailus@linux.intel.com \
    --to=sakari.ailus@linux.intel.com \
    --cc=andriy.shevchenko@linux.intel.com \
    --cc=devicetree@vger.kernel.org \
    --cc=heikki.krogerus@linux.intel.com \
    --cc=joe@perches.com \
    --cc=linux-acpi@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=pmladek@suse.com \
    --cc=rafael@kernel.org \
    --cc=robh@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).