Commit 32085f25 authored Nov 22, 2019 by David Bauer Committed by David S. Miller Nov 25, 2019

mdio_bus: don't use managed reset-controller



Geert Uytterhoeven reported that using devm_reset_controller_get leads
to a WARNING when probing a reset-controlled PHY. This is because the
device devm_reset_controller_get gets supplied is not actually the
one being probed.

Acquire an unmanaged reset-control as well as free the reset_control on
unregister to fix this.

Reported-by: Geert Uytterhoeven <geert@linux-m68k.org>
CC: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David Bauer <mail@david-bauer.net>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 31243461

drivers/net/phy/mdio_bus.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -62,7 +62,7 @@ static int mdiobus_register_reset(struct mdio_device *mdiodev)
		struct reset_control *reset = NULL;

		if (mdiodev->dev.of_node)
		reset = devm_reset_control_get_exclusive(&mdiodev->dev,
		reset = of_reset_control_get_exclusive(mdiodev->dev.of_node,
		"phy");
		if (IS_ERR(reset)) {
		if (PTR_ERR(reset) == -ENOENT \|\| PTR_ERR(reset) == -ENOTSUPP)
		@@ -107,6 +107,8 @@ int mdiobus_unregister_device(struct mdio_device *mdiodev)
		if (mdiodev->bus->mdio_map[mdiodev->addr] != mdiodev)
		return -EINVAL;

		reset_control_put(mdiodev->reset_ctrl);

		mdiodev->bus->mdio_map[mdiodev->addr] = NULL;

		return 0;

Admin message