1 files changed, 5 insertions, 2 deletions

diff --git a/drivers/net/phy/sfp.c b/drivers/net/phy/sfp.c
index 52fffb98fde9..6e13b8832bc7 100644
--- a/drivers/net/phy/sfp.c
+++ b/drivers/net/phy/sfp.c
@@ -1098,8 +1098,11 @@ static int sfp_hwmon_insert(struct sfp *sfp)
 
 static void sfp_hwmon_remove(struct sfp *sfp)
 {
-        hwmon_device_unregister(sfp->hwmon_dev);
-        kfree(sfp->hwmon_name);
+        if (!IS_ERR_OR_NULL(sfp->hwmon_dev)) {
+                hwmon_device_unregister(sfp->hwmon_dev);
+                sfp->hwmon_dev = NULL;
+                kfree(sfp->hwmon_name);
+        }
 }
 #else
 static int sfp_hwmon_insert(struct sfp *sfp)