projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
74e78d6
)
Revert "mdio_bus: fix mdio_register_device when RESET_CONTROLLER is disabled"
author
David S. Miller
<davem@davemloft.net>
Wed, 20 Nov 2019 03:16:49 +0000
(19:16 -0800)
committer
David S. Miller
<davem@davemloft.net>
Wed, 20 Nov 2019 03:16:49 +0000
(19:16 -0800)
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>
drivers/net/phy/mdio_bus.c
patch
|
blob
|
history
diff --git
a/drivers/net/phy/mdio_bus.c
b/drivers/net/phy/mdio_bus.c
index c87cb8c0dac8615fa0a5af78e0af4001c5cb1bc7..35876562e32a02ce8b8afd6a5626caba31619eef 100644
(file)
--- 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);