Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2c61e821 authored by David S. Miller's avatar David S. Miller
Browse files

Revert "mdio_bus: fix mdio_register_device when RESET_CONTROLLER is disabled" 



This reverts commit 075e238d.

Going to go with Geert's fix instead, which also has a
correct Fixes tag.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 74e78d6b

drivers/net/phy/mdio_bus.c

+1 −2
Original line number Diff line number Diff line
@@ -65,8 +65,7 @@ static int mdiobus_register_reset(struct mdio_device *mdiodev) 
		reset = devm_reset_control_get_exclusive(&mdiodev->dev,

							 "phy");

	if (IS_ERR(reset)) {

		if (PTR_ERR(reset) == -ENOENT || PTR_ERR(reset) == -ENOSYS ||

		    PTR_ERR(reset) == -ENOTSUPP)

		if (PTR_ERR(reset) == -ENOENT || PTR_ERR(reset) == -ENOSYS)

			reset = NULL;

		else

			return PTR_ERR(reset);