Skip to content

Commit

Permalink
Revert "mdio_bus: fix mdio_register_device when RESET_CONTROLLER is d…
Browse files Browse the repository at this point in the history
…isabled"

This reverts commit 075e238.

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

Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
David S. Miller committed Nov 20, 2019
1 parent 74e78d6 commit 2c61e82
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions drivers/net/phy/mdio_bus.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 2c61e82

Please sign in to comment.