TechPanelGM/kernel_xiaomi_sm8250
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

net: dsa: realtek-smi: fix OF child-node lookup

Browse Source 
commit 3f1bb6abdf19cfa89860b3bc9e7f31b44b6a0ba1 upstream.

Use the new of_get_compatible_child() helper to look up child nodes to
avoid ever matching non-child nodes elsewhere in the tree.

Also fix up the related struct device_node leaks.

Fixes: d8652956cf ("net: dsa: realtek-smi: Add Realtek SMI driver")
Cc: stable <stable@vger.kernel.org>     # 4.19: 36156f9241
Cc: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Johan Hovold <johan@kernel.org>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Johan Hovold
2019-01-16 11:27:08 +01:00
committed by Greg Kroah-Hartman
parent 0098f2e791
commit a10cabbf7a
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/net/dsa/realtek-smi.c
View File

@@ -347,16 +347,17 @@ int realtek_smi_setup_mdio(struct realtek_smi *smi)
struct device_node *mdio_np; struct device_node *mdio_np;
int ret; int ret;
mdio_np = of_find_compatible_node(smi->dev->of_node, NULL, mdio_np = of_get_compatible_child(smi->dev->of_node, "realtek,smi-mdio");
"realtek,smi-mdio");
if (!mdio_np) { if (!mdio_np) {
dev_err(smi->dev, "no MDIO bus node\n"); dev_err(smi->dev, "no MDIO bus node\n");
return -ENODEV; return -ENODEV;
} }
smi->slave_mii_bus = devm_mdiobus_alloc(smi->dev); smi->slave_mii_bus = devm_mdiobus_alloc(smi->dev);
if (!smi->slave_mii_bus) if (!smi->slave_mii_bus) {
return -ENOMEM; ret = -ENOMEM;
goto err_put_node;
}
smi->slave_mii_bus->priv = smi; smi->slave_mii_bus->priv = smi;
smi->slave_mii_bus->name = "SMI slave MII"; smi->slave_mii_bus->name = "SMI slave MII";
smi->slave_mii_bus->read = realtek_smi_mdio_read; smi->slave_mii_bus->read = realtek_smi_mdio_read;
@@ -371,10 +372,15 @@ int realtek_smi_setup_mdio(struct realtek_smi *smi)
if (ret) { if (ret) {
dev_err(smi->dev, "unable to register MDIO bus %s\n", dev_err(smi->dev, "unable to register MDIO bus %s\n",
smi->slave_mii_bus->id); smi->slave_mii_bus->id);
of_node_put(mdio_np); goto err_put_node;
} }
return 0; return 0;
err_put_node:
of_node_put(mdio_np);
return ret;
} }
static int realtek_smi_probe(struct platform_device *pdev) static int realtek_smi_probe(struct platform_device *pdev)
@@ -457,6 +463,8 @@ static int realtek_smi_remove(struct platform_device *pdev)
struct realtek_smi *smi = dev_get_drvdata(&pdev->dev); struct realtek_smi *smi = dev_get_drvdata(&pdev->dev);
dsa_unregister_switch(smi->ds); dsa_unregister_switch(smi->ds);
if (smi->slave_mii_bus)
of_node_put(smi->slave_mii_bus->dev.of_node);
gpiod_set_value(smi->reset, 1); gpiod_set_value(smi->reset, 1);
return 0; return 0;