[net] net: sfp: fix hwmon
diff mbox series

Message ID E1icHx2-00043k-4d@rmk-PC.armlinux.org.uk
State Accepted
Delegated to: David Miller
Headers show
Series
  • [net] net: sfp: fix hwmon
Related show

Commit Message

Russell King Dec. 3, 2019, 11:51 p.m. UTC
The referenced commit below allowed more than one hwmon device to be
created per SFP, which is definitely not what we want. Avoid this by
only creating the hwmon device just as we transition to WAITDEV state.

Fixes: 139d3a212a1f ("net: sfp: allow modules with slow diagnostics to probe")
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
---
 drivers/net/phy/sfp.c | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

Comments

David Miller Dec. 5, 2019, 12:58 a.m. UTC | #1
From: Russell King <rmk+kernel@armlinux.org.uk>
Date: Tue, 03 Dec 2019 23:51:28 +0000

> The referenced commit below allowed more than one hwmon device to be
> created per SFP, which is definitely not what we want. Avoid this by
> only creating the hwmon device just as we transition to WAITDEV state.
> 
> Fixes: 139d3a212a1f ("net: sfp: allow modules with slow diagnostics to probe")
> Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>

Applied.

Patch
diff mbox series

diff --git a/drivers/net/phy/sfp.c b/drivers/net/phy/sfp.c
index 78f53da1e34e..5876d34d8dd0 100644
--- a/drivers/net/phy/sfp.c
+++ b/drivers/net/phy/sfp.c
@@ -1754,6 +1754,10 @@  static void sfp_sm_module(struct sfp *sfp, unsigned int event)
 			break;
 		}
 
+		err = sfp_hwmon_insert(sfp);
+		if (err)
+			dev_warn(sfp->dev, "hwmon probe failed: %d\n", err);
+
 		sfp_sm_mod_next(sfp, SFP_MOD_WAITDEV, 0);
 		/* fall through */
 	case SFP_MOD_WAITDEV:
@@ -1803,15 +1807,6 @@  static void sfp_sm_module(struct sfp *sfp, unsigned int event)
 	case SFP_MOD_ERROR:
 		break;
 	}
-
-#if IS_ENABLED(CONFIG_HWMON)
-	if (sfp->sm_mod_state >= SFP_MOD_WAITDEV &&
-	    IS_ERR_OR_NULL(sfp->hwmon_dev)) {
-		err = sfp_hwmon_insert(sfp);
-		if (err)
-			dev_warn(sfp->dev, "hwmon probe failed: %d\n", err);
-	}
-#endif
 }
 
 static void sfp_sm_main(struct sfp *sfp, unsigned int event)