summaryrefslogtreecommitdiffstats
path: root/drivers/net/mdio
diff options
context:
space:
mode:
authorSaravana Kannan <saravanak@google.com>2022-08-20 00:16:12 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2022-08-23 13:14:02 +0200
commitcffaf9721f755b46370e7be0592dc41168c95019 (patch)
tree8d998155450c6e44f2f407e22102cfb04b609d8b /drivers/net/mdio
parentRevert "driver core: Delete driver_deferred_probe_check_state()" (diff)
downloadlinux-cffaf9721f755b46370e7be0592dc41168c95019.tar.xz
linux-cffaf9721f755b46370e7be0592dc41168c95019.zip
Revert "net: mdio: Delete usage of driver_deferred_probe_check_state()"
This reverts commit f8217275b57aa48d98cc42051c2aac34152718d6. There are a few more issues to fix that have been reported in the thread for the original series [1]. We'll need to fix those before this will work. So, revert it for now. [1] - https://lore.kernel.org/lkml/CAMuHMdWo_wRwV-i_iyTxVnEsf3Th9GBAG+wxUQMQGnw1t2ijTg@mail.gmail.com/ Fixes: f8217275b57a ("net: mdio: Delete usage of driver_deferred_probe_check_state()") Reported-by: Geert Uytterhoeven <geert@linux-m68k.org> Tested-by: Alexander Stein <alexander.stein@ew.tq-group.com> Reviewed-by: Tony Lindgren <tony@atomide.com> Signed-off-by: Saravana Kannan <saravanak@google.com> Link: https://lore.kernel.org/r/20220819221616.2107893-3-saravanak@google.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/net/mdio')
-rw-r--r--drivers/net/mdio/fwnode_mdio.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/mdio/fwnode_mdio.c b/drivers/net/mdio/fwnode_mdio.c
index 3e79c2c51929..1c1584fca632 100644
--- a/drivers/net/mdio/fwnode_mdio.c
+++ b/drivers/net/mdio/fwnode_mdio.c
@@ -47,7 +47,9 @@ int fwnode_mdiobus_phy_device_register(struct mii_bus *mdio,
* just fall back to poll mode
*/
if (rc == -EPROBE_DEFER)
- rc = -ENODEV;
+ rc = driver_deferred_probe_check_state(&phy->mdio.dev);
+ if (rc == -EPROBE_DEFER)
+ return rc;
if (rc > 0) {
phy->irq = rc;