aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2019-11-19 19:16:49 -0800
committerDavid S. Miller <davem@davemloft.net>2019-11-19 19:16:49 -0800
commit2c61e821da7a5bc0c4eff24f040e1ec556024e3c (patch)
tree73437de0c910e398ed604da78260e209c8de1521 /drivers
parentnet: hns3: fix a wrong reset interrupt status mask (diff)
downloadlinux-dev-2c61e821da7a5bc0c4eff24f040e1ec556024e3c.tar.xz
linux-dev-2c61e821da7a5bc0c4eff24f040e1ec556024e3c.zip
Revert "mdio_bus: fix mdio_register_device when RESET_CONTROLLER is disabled"
This reverts commit 075e238d12c21c8bde700d21fb48be7a3aa80194. Going to go with Geert's fix instead, which also has a correct Fixes tag. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/phy/mdio_bus.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/phy/mdio_bus.c b/drivers/net/phy/mdio_bus.c
index c87cb8c0dac8..35876562e32a 100644
--- a/drivers/net/phy/mdio_bus.c
+++ b/drivers/net/phy/mdio_bus.c
@@ -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);