diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-07-18 23:41:42 +0300 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-07-18 23:41:42 +0300 |
commit | dc14036fb3240a1bc2677cf8de33fbcb3af77826 (patch) | |
tree | 177cd42a0fdc3e37504075d3b389bf7e894ffb5e /drivers/net/can/grcan.c | |
parent | c76d09da77d69d7f737540985912ad2bca654713 (diff) | |
parent | ff6992735ade75aae3e35d16b17da1008d753d28 (diff) | |
download | linux-dc14036fb3240a1bc2677cf8de33fbcb3af77826.tar.xz |
Merge 5.19-rc7 into usb-next
We need the USB fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/net/can/grcan.c')
-rw-r--r-- | drivers/net/can/grcan.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/can/grcan.c b/drivers/net/can/grcan.c index 76df4807d366..4c47c1055eff 100644 --- a/drivers/net/can/grcan.c +++ b/drivers/net/can/grcan.c @@ -1646,7 +1646,6 @@ static int grcan_probe(struct platform_device *ofdev) */ sysid_parent = of_find_node_by_path("/ambapp0"); if (sysid_parent) { - of_node_get(sysid_parent); err = of_property_read_u32(sysid_parent, "systemid", &sysid); if (!err && ((sysid & GRLIB_VERSION_MASK) >= GRCAN_TXBUG_SAFE_GRLIB_VERSION)) |