Commit 8b0f4525 authored by Johan Hovold's avatar Johan Hovold Committed by Kleber Sacilotto de Souza

NFC: nfcmrvl_uart: fix OF child-node lookup

BugLink: https://bugs.launchpad.net/bugs/1810967

[ Upstream commit 5bf59773 ]

Use the new of_get_compatible_child() helper to lookup the nfc child
node instead of using of_find_compatible_node(), which searches the
entire tree from a given start node and thus can return an unrelated
(i.e. non-child) node.

This also addresses a potential use-after-free (e.g. after probe
deferral) as the tree-wide helper drops a reference to its first
argument (i.e. the parent node).

Fixes: e097dc62 ("NFC: nfcmrvl: add UART driver")
Fixes: d8e018c0 ("NFC: nfcmrvl: update device tree bindings for Marvell NFC")
Cc: stable <stable@vger.kernel.org>     # 4.2
Cc: Vincent Cuissard <cuissard@marvell.com>
Cc: Samuel Ortiz <sameo@linux.intel.com>
Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
Signed-off-by: default avatarRob Herring <robh@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarJuerg Haefliger <juergh@canonical.com>
Signed-off-by: default avatarKleber Sacilotto de Souza <kleber.souza@canonical.com>
parent 9fc3f0c9
...@@ -73,10 +73,9 @@ static int nfcmrvl_uart_parse_dt(struct device_node *node, ...@@ -73,10 +73,9 @@ static int nfcmrvl_uart_parse_dt(struct device_node *node,
struct device_node *matched_node; struct device_node *matched_node;
int ret; int ret;
matched_node = of_find_compatible_node(node, NULL, "marvell,nfc-uart"); matched_node = of_get_compatible_child(node, "marvell,nfc-uart");
if (!matched_node) { if (!matched_node) {
matched_node = of_find_compatible_node(node, NULL, matched_node = of_get_compatible_child(node, "mrvl,nfc-uart");
"mrvl,nfc-uart");
if (!matched_node) if (!matched_node)
return -ENODEV; return -ENODEV;
} }
......
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